summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2018-08-20Merge branch 'pw/rebase-i-merge-segv-fix'Junio C Hamano
2018-08-20Merge branch 'pw/rebase-i-squash-number-fix'Junio C Hamano
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano
2018-08-20Merge branch 'js/rebase-merges-exec-fix'Junio C Hamano
2018-08-17Merge branch 'es/rebase-i-author-script-fix'Junio C Hamano
2018-08-16rebase -i: fix SIGSEGV when 'merge <branch>' failsPhillip Wood
2018-08-15Merge branch 'nd/i18n'Junio C Hamano
2018-08-15rebase -i: fix numbering in squash messagePhillip Wood
2018-08-13cache-tree: wrap the_index based wrappers with #ifdefNguyễn Thái Ngọc Duy
2018-08-09rebase --exec: make it work with --rebase-mergesJohannes Schindelin
2018-08-02Merge branch 'bc/sequencer-export-work-tree-as-well'Junio C Hamano
2018-08-02Merge branch 'js/rebase-merge-octopus'Junio C Hamano
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano
2018-07-31sequencer: don't die() on bogus user-edited timestampEric Sunshine
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timestampEric Sunshine
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timezoneEric Sunshine
2018-07-31sequencer: fix "rebase -i --root" corrupting author headerEric Sunshine
2018-07-24Merge branch 'as/sequencer-customizable-comment-char'Junio C Hamano
2018-07-24Merge branch 'jk/empty-pick-fix'Junio C Hamano
2018-07-24Merge branch 'bb/pedantic'Junio C Hamano
2018-07-23sequencer.c: mark more strings for translationNguyễn Thái Ngọc Duy
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy
2018-07-18Merge branch 'en/rebase-i-microfixes'Junio C Hamano
2018-07-18Merge branch 'pw/rebase-i-keep-reword-after-conflict'Junio C Hamano
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano
2018-07-16sequencer: pass absolute GIT_WORK_TREE to exec commandsbrian m. carlson
2018-07-16sequencer: use configured comment characterAaron Schrab
2018-07-11rebase --rebase-merges: add support for octopus mergesJohannes Schindelin
2018-07-11sequencer: don't say BUG on bogus inputJeff King
2018-07-11sequencer: handle empty-set cases consistentlyJeff King
2018-07-09sequencer.c: avoid empty statements at top levelBeat Bolli
2018-06-29commit: add repository argument to lookup_commitStefan Beller
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller
2018-06-29commit: add repository argument to lookup_commit_reference_gentlyStefan Beller
2018-06-29tree: add repository argument to lookup_treeStefan Beller
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano
2018-06-27Fix use of strategy options with interactive rebasesElijah Newren
2018-06-25Merge branch 'sb/plug-misc-leaks'Junio C Hamano
2018-06-25Merge branch 'nd/commit-util-to-slab'Junio C Hamano
2018-06-25sequencer.c: plug mem leak in git_sequencer_configStefan Beller
2018-06-19sequencer: do not squash 'reword' commits when we hit conflictsPhillip Wood
2018-06-18Merge branch 'js/rebase-i-root-fix'Junio C Hamano
2018-06-18rebase --root: fix amending root commit messagesJohannes Schindelin
2018-06-04sequencer.c: plug leaks in do_pick_commitStefan Beller
2018-06-01Merge branch 'js/rebase-recreate-merge'Junio C Hamano
2018-06-01Merge branch 'nd/command-list'Junio C Hamano
2018-05-30Merge branch 'bc/object-id'Junio C Hamano
2018-05-30Merge branch 'js/sequencer-and-root-commits'Junio C Hamano
2018-05-30sequencer: ensure labels that are object IDs are rewrittenbrian m. carlson
2018-05-23Merge branch 'js/rebase-recreate-merge'Junio C Hamano