summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2018-09-04Merge branch 'pw/rebase-i-author-script-fix'Junio C Hamano1-9/+38
2018-08-23i18n: fix mistakes in translated stringsJean-Noël Avila1-1/+1
2018-08-20Merge branch 'pw/rebase-i-merge-segv-fix'Junio C Hamano1-5/+19
2018-08-20Merge branch 'pw/rebase-i-squash-number-fix'Junio C Hamano1-2/+2
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano1-2/+2
2018-08-20Merge branch 'js/rebase-merges-exec-fix'Junio C Hamano1-11/+31
2018-08-17Merge branch 'es/rebase-i-author-script-fix'Junio C Hamano1-15/+24
2018-08-16rebase -i: fix SIGSEGV when 'merge <branch>' failsPhillip Wood1-5/+19
2018-08-15Merge branch 'nd/i18n'Junio C Hamano1-13/+15
2018-08-15rebase -i: fix numbering in squash messagePhillip Wood1-2/+2
2018-08-13cache-tree: wrap the_index based wrappers with #ifdefNguyễn Thái Ngọc Duy1-2/+2
2018-08-09rebase --exec: make it work with --rebase-mergesJohannes Schindelin1-11/+31
2018-08-07sequencer: fix quoting in write_author_scriptPhillip Wood1-7/+29
2018-08-07sequencer: handle errors from read_author_ident()Phillip Wood1-2/+9
2018-08-02Merge branch 'bc/sequencer-export-work-tree-as-well'Junio C Hamano1-0/+2
2018-08-02Merge branch 'js/rebase-merge-octopus'Junio C Hamano1-43/+125
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano1-7/+7
2018-07-31sequencer: don't die() on bogus user-edited timestampEric Sunshine1-0/+9
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-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
generated by cgit (git 2.54.0.dirty) at 2026-09-15 07:44:54 +0000