summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2018-11-21Merge branch 'rs/sequencer-oidset-insert-avoids-dups' into maintJunio C Hamano-3/+1
2018-11-21Merge branch 'en/sequencer-empty-edit-result-aborts' into maintJunio C Hamano-2/+2
2018-11-21Merge branch 'js/rebase-i-autosquash-fix' into maintJunio C Hamano-3/+14
2018-11-21Merge branch 'jk/trailer-fixes' into maintJunio C Hamano-4/+7
2018-10-03sequencer: use return value of oidset_insert()René Scharfe-3/+1
2018-09-13sequencer: fix --allow-empty-message behavior, make it smarterElijah Newren-2/+2
2018-09-04Merge branch 'pw/rebase-i-author-script-fix'Junio C Hamano-9/+38
2018-09-04rebase -i: be careful to wrap up fixup/squash chainsJohannes Schindelin-3/+14
2018-08-23i18n: fix mistakes in translated stringsJean-Noël Avila-1/+1
2018-08-23append_signoff: use size_t for string offsetsJeff King-2/+2
2018-08-23sequencer: ignore "---" divider when parsing trailersJeff King-0/+2
2018-08-23trailer: pass process_trailer_opts to trailer_info_get()Jeff King-1/+2
2018-08-23trailer: use size_t for iterating trailer listJeff King-1/+1
2018-08-20Merge branch 'pw/rebase-i-merge-segv-fix'Junio C Hamano-5/+19
2018-08-20Merge branch 'pw/rebase-i-squash-number-fix'Junio C Hamano-2/+2
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano-2/+2
2018-08-20Merge branch 'js/rebase-merges-exec-fix'Junio C Hamano-11/+31
2018-08-17Merge branch 'es/rebase-i-author-script-fix'Junio C Hamano-15/+24
2018-08-16rebase -i: fix SIGSEGV when 'merge <branch>' failsPhillip Wood-5/+19
2018-08-15Merge branch 'nd/i18n'Junio C Hamano-13/+15
2018-08-15rebase -i: fix numbering in squash messagePhillip Wood-2/+2
2018-08-13cache-tree: wrap the_index based wrappers with #ifdefNguyễn Thái Ngọc Duy-2/+2
2018-08-09rebase --exec: make it work with --rebase-mergesJohannes Schindelin-11/+31
2018-08-07sequencer: fix quoting in write_author_scriptPhillip Wood-7/+29
2018-08-07sequencer: handle errors from read_author_ident()Phillip Wood-2/+9
2018-08-02Merge branch 'bc/sequencer-export-work-tree-as-well'Junio C Hamano-0/+2
2018-08-02Merge branch 'js/rebase-merge-octopus'Junio C Hamano-43/+125
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano-7/+7
2018-07-31sequencer: don't die() on bogus user-edited timestampEric Sunshine-0/+9
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timestampEric Sunshine-14/+9
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timezoneEric Sunshine-1/+6
2018-07-31sequencer: fix "rebase -i --root" corrupting author headerEric Sunshine-1/+1
2018-07-24Merge branch 'as/sequencer-customizable-comment-char'Junio C Hamano-1/+1
2018-07-24Merge branch 'jk/empty-pick-fix'Junio C Hamano-4/+8
2018-07-24Merge branch 'bb/pedantic'Junio C Hamano-2/+2
2018-07-23sequencer.c: mark more strings for translationNguyễn Thái Ngọc Duy-12/+14
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy-4/+4
2018-07-18Merge branch 'en/rebase-i-microfixes'Junio C Hamano-1/+6
2018-07-18Merge branch 'pw/rebase-i-keep-reword-after-conflict'Junio C Hamano-3/+20
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano-25/+27
2018-07-16sequencer: pass absolute GIT_WORK_TREE to exec commandsbrian m. carlson-0/+2
2018-07-16sequencer: use configured comment characterAaron Schrab-1/+1
2018-07-11rebase --rebase-merges: add support for octopus mergesJohannes Schindelin-43/+125
2018-07-11sequencer: don't say BUG on bogus inputJeff King-2/+4
2018-07-11sequencer: handle empty-set cases consistentlyJeff King-2/+4
2018-07-09sequencer.c: avoid empty statements at top levelBeat Bolli-2/+2
2018-06-29commit: add repository argument to lookup_commitStefan Beller-2/+2
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller-3/+3
2018-06-29commit: add repository argument to lookup_commit_reference_gentlyStefan Beller-1/+1
2018-06-29tree: add repository argument to lookup_treeStefan Beller-1/+1