summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2018-08-20Merge branch 'pw/rebase-i-merge-segv-fix'Libravatar Junio C Hamano1-5/+19
2018-08-20Merge branch 'pw/rebase-i-squash-number-fix'Libravatar Junio C Hamano1-2/+2
2018-08-20Merge branch 'nd/no-the-index'Libravatar Junio C Hamano1-2/+2
2018-08-20Merge branch 'js/rebase-merges-exec-fix'Libravatar Junio C Hamano1-11/+31
2018-08-17Merge branch 'es/rebase-i-author-script-fix'Libravatar Junio C Hamano1-15/+24
2018-08-16rebase -i: fix SIGSEGV when 'merge <branch>' failsLibravatar Phillip Wood1-5/+19
2018-08-15Merge branch 'nd/i18n'Libravatar Junio C Hamano1-13/+15
2018-08-15rebase -i: fix numbering in squash messageLibravatar Phillip Wood1-2/+2
2018-08-13cache-tree: wrap the_index based wrappers with #ifdefLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2018-08-09rebase --exec: make it work with --rebase-mergesLibravatar Johannes Schindelin1-11/+31
2018-08-02Merge branch 'bc/sequencer-export-work-tree-as-well'Libravatar Junio C Hamano1-0/+2
2018-08-02Merge branch 'js/rebase-merge-octopus'Libravatar Junio C Hamano1-43/+125
2018-08-02Merge branch 'sb/object-store-lookup'Libravatar Junio C Hamano1-7/+7
2018-07-31sequencer: don't die() on bogus user-edited timestampLibravatar Eric Sunshine1-0/+9
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timestampLibravatar Eric Sunshine1-14/+9
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timezoneLibravatar Eric Sunshine1-1/+6
2018-07-31sequencer: fix "rebase -i --root" corrupting author headerLibravatar Eric Sunshine1-1/+1
2018-07-24Merge branch 'as/sequencer-customizable-comment-char'Libravatar Junio C Hamano1-1/+1
2018-07-24Merge branch 'jk/empty-pick-fix'Libravatar Junio C Hamano1-4/+8
2018-07-24Merge branch 'bb/pedantic'Libravatar Junio C Hamano1-2/+2
2018-07-23sequencer.c: mark more strings for translationLibravatar Nguyễn Thái Ngọc Duy1-12/+14
2018-07-23Update messages in preparation for i18nLibravatar Nguyễn Thái Ngọc Duy1-4/+4
2018-07-18Merge branch 'en/rebase-i-microfixes'Libravatar Junio C Hamano1-1/+6
2018-07-18Merge branch 'pw/rebase-i-keep-reword-after-conflict'Libravatar Junio C Hamano1-3/+20
2018-07-18Merge branch 'sb/object-store-grafts'Libravatar Junio C Hamano1-25/+27
2018-07-16sequencer: pass absolute GIT_WORK_TREE to exec commandsLibravatar brian m. carlson1-0/+2
2018-07-16sequencer: use configured comment characterLibravatar Aaron Schrab1-1/+1
2018-07-11rebase --rebase-merges: add support for octopus mergesLibravatar Johannes Schindelin1-43/+125
2018-07-11sequencer: don't say BUG on bogus inputLibravatar Jeff King1-2/+4
2018-07-11sequencer: handle empty-set cases consistentlyLibravatar Jeff King1-2/+4
2018-07-09sequencer.c: avoid empty statements at top levelLibravatar Beat Bolli1-2/+2
2018-06-29commit: add repository argument to lookup_commitLibravatar Stefan Beller1-2/+2
2018-06-29commit: add repository argument to lookup_commit_referenceLibravatar Stefan Beller1-3/+3
2018-06-29commit: add repository argument to lookup_commit_reference_gentlyLibravatar Stefan Beller1-1/+1
2018-06-29tree: add repository argument to lookup_treeLibravatar Stefan Beller1-1/+1
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupLibravatar Junio C Hamano1-25/+27
2018-06-27Fix use of strategy options with interactive rebasesLibravatar Elijah Newren1-1/+6
2018-06-25Merge branch 'sb/plug-misc-leaks'Libravatar Junio C Hamano1-1/+3
2018-06-25Merge branch 'nd/commit-util-to-slab'Libravatar Junio C Hamano1-6/+18
2018-06-25sequencer.c: plug mem leak in git_sequencer_configLibravatar Stefan Beller1-0/+1
2018-06-19sequencer: do not squash 'reword' commits when we hit conflictsLibravatar Phillip Wood1-3/+20
2018-06-18Merge branch 'js/rebase-i-root-fix'Libravatar Junio C Hamano1-1/+1
2018-06-18rebase --root: fix amending root commit messagesLibravatar Johannes Schindelin1-1/+1
2018-06-04sequencer.c: plug leaks in do_pick_commitLibravatar Stefan Beller1-1/+2
2018-06-01Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano1-1/+1
2018-06-01Merge branch 'nd/command-list'Libravatar Junio C Hamano1-0/+1
2018-05-30Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2018-05-30Merge branch 'js/sequencer-and-root-commits'Libravatar Junio C Hamano1-25/+181
2018-05-30sequencer: ensure labels that are object IDs are rewrittenLibravatar brian m. carlson1-1/+1
2018-05-23Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano1-37/+855
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 06:20:51 +0000