aboutsummaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timestampEric Sunshine1-14/+9
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timezoneEric Sunshine1-1/+6
2018-07-31sequencer: fix "rebase -i --root" corrupting author headerEric Sunshine1-1/+1
2018-07-24Merge branch 'as/sequencer-customizable-comment-char'Junio C Hamano1-1/+1
2018-07-24Merge branch 'jk/empty-pick-fix'Junio C Hamano1-4/+8
2018-07-24Merge branch 'bb/pedantic'Junio C Hamano1-2/+2
2018-07-23sequencer.c: mark more strings for translationNguyễn Thái Ngọc Duy1-12/+14
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy1-4/+4
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-07-18Merge branch 'en/rebase-i-microfixes'Junio C Hamano1-1/+6
2018-07-18Merge branch 'pw/rebase-i-keep-reword-after-conflict'Junio C Hamano1-3/+20
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-25/+27
2018-07-16sequencer: pass absolute GIT_WORK_TREE to exec commandsbrian m. carlson1-0/+2
2018-07-16sequencer: use configured comment characterAaron Schrab1-1/+1
2018-07-11rebase --rebase-merges: add support for octopus mergesJohannes Schindelin1-43/+125
2018-07-11sequencer: don't say BUG on bogus inputJeff King1-2/+4
2018-07-11sequencer: handle empty-set cases consistentlyJeff King1-2/+4
2018-07-09sequencer.c: avoid empty statements at top levelBeat Bolli1-2/+2
2018-06-29commit: add repository argument to lookup_commitStefan Beller1-2/+2
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller1-3/+3
2018-06-29commit: add repository argument to lookup_commit_reference_gentlyStefan Beller1-1/+1
2018-06-29tree: add repository argument to lookup_treeStefan Beller1-1/+1
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-25/+27
2018-06-27Fix use of strategy options with interactive rebasesElijah Newren1-1/+6
2018-06-25Merge branch 'sb/plug-misc-leaks'Junio C Hamano1-1/+3
2018-06-25Merge branch 'nd/commit-util-to-slab'Junio C Hamano1-6/+18
2018-06-25sequencer.c: plug mem leak in git_sequencer_configStefan Beller1-0/+1
2018-06-19sequencer: do not squash 'reword' commits when we hit conflictsPhillip Wood1-3/+20
2018-06-18Merge branch 'js/rebase-i-root-fix'Junio C Hamano1-1/+1
2018-06-18rebase --root: fix amending root commit messagesJohannes Schindelin1-1/+1
2018-06-04sequencer.c: plug leaks in do_pick_commitStefan Beller1-1/+2
2018-06-01Merge branch 'js/rebase-recreate-merge'Junio C Hamano1-1/+1
2018-06-01Merge branch 'nd/command-list'Junio C Hamano1-0/+1
2018-05-30Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2018-05-30Merge branch 'js/sequencer-and-root-commits'Junio C Hamano1-25/+181
2018-05-30sequencer: ensure labels that are object IDs are rewrittenbrian m. carlson1-1/+1
2018-05-23Merge branch 'js/rebase-recreate-merge'Junio C Hamano1-37/+855
2018-05-23Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Junio C Hamano1-47/+146
2018-05-23Merge branch 'sb/oid-object-info'Junio C Hamano1-1/+2
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano1-6/+6
2018-05-21sequencer.c: use commit-slab to associate todo items to commitsNguyễn Thái Ngọc Duy1-3/+9
2018-05-21sequencer.c: use commit-slab to mark seen commitsNguyễn Thái Ngọc Duy1-3/+9
2018-05-21Move declaration for alias.c to alias.hNguyễn Thái Ngọc Duy1-0/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-18/+19
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-05-08Merge branch 'js/ident-date-fix'Junio C Hamano1-0/+2
2018-05-06rebase --rebase-merges: root commits can be cousins, tooJohannes Schindelin1-1/+2
2018-05-06sequencer: learn about the special "fake root commit" handlingJohannes Schindelin1-3/+121
2018-05-06rebase --rebase-merges: a "merge" into a new root is a fast-forwardJohannes Schindelin1-0/+12
2018-05-06sequencer: allow introducing new root commitsJohannes Schindelin1-12/+28