summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'pw/rebase-i-author-script-fix'Junio C Hamano2018-09-041-9/+38
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | sequencer: fix quoting in write_author_scriptPhillip Wood2018-08-071-7/+29
| * | | | sequencer: handle errors from read_author_ident()Phillip Wood2018-08-071-2/+9
* | | | | i18n: fix mistakes in translated stringsJean-Noël Avila2018-08-231-1/+1
* | | | | Merge branch 'pw/rebase-i-merge-segv-fix'Junio C Hamano2018-08-201-5/+19
|\ \ \ \ \
| * | | | | rebase -i: fix SIGSEGV when 'merge <branch>' failsPhillip Wood2018-08-161-5/+19
| | |_|/ / | |/| | |
* | | | | Merge branch 'pw/rebase-i-squash-number-fix'Junio C Hamano2018-08-201-2/+2
|\ \ \ \ \
| * | | | | rebase -i: fix numbering in squash messagePhillip Wood2018-08-151-2/+2
* | | | | | Merge branch 'nd/no-the-index'Junio C Hamano2018-08-201-2/+2
|\ \ \ \ \ \
| * | | | | | cache-tree: wrap the_index based wrappers with #ifdefNguyễn Thái Ngọc Duy2018-08-131-2/+2
* | | | | | | Merge branch 'js/rebase-merges-exec-fix'Junio C Hamano2018-08-201-11/+31
|\ \ \ \ \ \ \
| * | | | | | | rebase --exec: make it work with --rebase-mergesJohannes Schindelin2018-08-091-11/+31
| |/ / / / / /
* | | | | | | Merge branch 'es/rebase-i-author-script-fix'Junio C Hamano2018-08-171-15/+24
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | sequencer: don't die() on bogus user-edited timestampEric Sunshine2018-07-311-0/+9
| * | | | | | sequencer: fix "rebase -i --root" corrupting author header timestampEric Sunshine2018-07-311-14/+9
| * | | | | | sequencer: fix "rebase -i --root" corrupting author header timezoneEric Sunshine2018-07-311-1/+6
| * | | | | | sequencer: fix "rebase -i --root" corrupting author headerEric Sunshine2018-07-311-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'nd/i18n'Junio C Hamano2018-08-151-13/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | sequencer.c: mark more strings for translationNguyễn Thái Ngọc Duy2018-07-231-12/+14
| * | | | | Update messages in preparation for i18nNguyễn Thái Ngọc Duy2018-07-231-4/+4
* | | | | | Merge branch 'bc/sequencer-export-work-tree-as-well'Junio C Hamano2018-08-021-0/+2
|\ \ \ \ \ \
| * | | | | | sequencer: pass absolute GIT_WORK_TREE to exec commandsbrian m. carlson2018-07-161-0/+2
* | | | | | | Merge branch 'js/rebase-merge-octopus'Junio C Hamano2018-08-021-43/+125
|\ \ \ \ \ \ \
| * | | | | | | rebase --rebase-merges: add support for octopus mergesJohannes Schindelin2018-07-111-43/+125
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-021-7/+7
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | commit: add repository argument to lookup_commitStefan Beller2018-06-291-2/+2
| * | | | | | commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-3/+3
| * | | | | | commit: add repository argument to lookup_commit_reference_gentlyStefan Beller2018-06-291-1/+1
| * | | | | | tree: add repository argument to lookup_treeStefan Beller2018-06-291-1/+1
| * | | | | | Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-25/+27
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'as/sequencer-customizable-comment-char'Junio C Hamano2018-07-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | sequencer: use configured comment characterAaron Schrab2018-07-161-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'jk/empty-pick-fix'Junio C Hamano2018-07-241-4/+8
|\ \ \ \ \ \ \
| * | | | | | | sequencer: don't say BUG on bogus inputJeff King2018-07-111-2/+4
| * | | | | | | sequencer: handle empty-set cases consistentlyJeff King2018-07-111-2/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'bb/pedantic'Junio C Hamano2018-07-241-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | sequencer.c: avoid empty statements at top levelBeat Bolli2018-07-091-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'en/rebase-i-microfixes'Junio C Hamano2018-07-181-1/+6
|\ \ \ \ \ \
| * | | | | | Fix use of strategy options with interactive rebasesElijah Newren2018-06-271-1/+6
* | | | | | | Merge branch 'pw/rebase-i-keep-reword-after-conflict'Junio C Hamano2018-07-181-3/+20
|\ \ \ \ \ \ \
| * | | | | | | sequencer: do not squash 'reword' commits when we hit conflictsPhillip Wood2018-06-191-3/+20
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-25/+27
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-181-18/+19
| * | | | | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | | | | Merge branch 'sb/plug-misc-leaks'Junio C Hamano2018-06-251-1/+3
|\ \ \ \ \ \
| * | | | | | sequencer.c: plug mem leak in git_sequencer_configStefan Beller2018-06-251-0/+1
| * | | | | | sequencer.c: plug leaks in do_pick_commitStefan Beller2018-06-041-1/+2
* | | | | | | Merge branch 'nd/commit-util-to-slab'Junio C Hamano2018-06-251-6/+18
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | sequencer.c: use commit-slab to associate todo items to commitsNguyễn Thái Ngọc Duy2018-05-211-3/+9
| * | | | | | sequencer.c: use commit-slab to mark seen commitsNguyễn Thái Ngọc Duy2018-05-211-3/+9