summaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* strvec: rename struct fieldsJeff King2020-07-311-2/+2
* strvec: fix indentation in renamed callsJeff King2020-07-291-4/+4
* strvec: convert remaining callers away from argv_array nameJeff King2020-07-291-56/+56
* strvec: rename files from argv-array to strvecJeff King2020-07-291-1/+1
* Merge branch 'js/rebase-autosquash-double-fixup-fix'Junio C Hamano2020-05-141-2/+5
|\
| * rebase --autosquash: fix a potential segfaultJohannes Schindelin2020-05-091-2/+5
* | Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-301-47/+129
|\ \
| * | sequencer: implement apply_autostash_oid()Denton Liu2020-04-101-12/+26
| * | sequencer: implement save_autostash()Denton Liu2020-04-101-10/+27
| * | sequencer: unlink autostash in apply_autostash()Denton Liu2020-04-101-0/+1
| * | sequencer: extract perform_autostash() from rebaseDenton Liu2020-04-101-0/+50
| * | rebase: use apply_autostash() from sequencer.cDenton Liu2020-04-101-1/+1
| * | sequencer: rename stash_sha1 to stash_oidDenton Liu2020-04-101-8/+8
| * | sequencer: make apply_autostash() accept a pathDenton Liu2020-04-101-7/+7
| * | sequencer: make read_oneliner() externDenton Liu2020-04-081-13/+1
| * | sequencer: configurably warn on non-existent filesDenton Liu2020-04-081-1/+3
| * | sequencer: make read_oneliner() accept flagsDenton Liu2020-04-081-7/+14
| * | sequencer: make file exists check more efficientDenton Liu2020-04-081-4/+2
| * | sequencer: stop leaking bufDenton Liu2020-04-051-4/+9
* | | Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano2020-04-221-1/+2
|\ \ \
| * | | rebase --merge: optionally skip upstreamed commitsJonathan Tan2020-04-111-1/+2
* | | | Merge branch 'en/rebase-no-keep-empty'Junio C Hamano2020-04-221-0/+11
|\| | |
| * | | rebase: reinstate --no-keep-emptyElijah Newren2020-04-111-0/+6
| * | | rebase -i: mark commits that begin empty in todo editorElijah Newren2020-04-111-0/+5
| |/ /
* | | Merge branch 'dd/no-gpg-sign'Junio C Hamano2020-04-221-0/+2
|\ \ \
| * | | cherry-pick/revert: honour --no-gpg-sign in all caseĐoàn Trần Công Danh2020-04-031-0/+2
| |/ /
* | | Merge branch 'en/sequencer-reflog-action'Junio C Hamano2020-04-221-2/+8
|\ \ \
| * | | sequencer: honor GIT_REFLOG_ACTIONElijah Newren2020-04-081-2/+8
| |/ /
* | | Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'Junio C Hamano2020-04-221-3/+6
|\ \ \
| * | | sequencer: don't abbreviate a command if it doesn't have a short formAlban Gruin2020-03-301-3/+6
| |/ /
* | | sequencer: mark messages for translationAlban Gruin2020-03-291-3/+3
* | | Merge branch 'bc/filter-process'Junio C Hamano2020-03-271-0/+1
|\ \ \
| * | | builtin/rebase: compute checkout metadata for rebasesbrian m. carlson2020-03-161-0/+1
* | | | Merge branch 'bc/sha-256-part-1-of-4'Junio C Hamano2020-03-271-1/+1
|\ \ \ \
| * | | | commit: use expected signature header for SHA-256brian m. carlson2020-02-241-1/+1
* | | | | Merge branch 'pw/advise-rebase-skip'Junio C Hamano2020-03-251-8/+44
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | commit: give correct advice for empty commit during a rebasePhillip Wood2019-12-061-8/+31
| * | | | commit: encapsulate determine_whence() for sequencerPhillip Wood2019-12-061-1/+12
| * | | | sequencer: write CHERRY_PICK_HEAD for reword and editPhillip Wood2019-12-061-1/+3
* | | | | Merge branch 'en/rebase-backend'Junio C Hamano2020-03-121-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | sequencer: clear state upon dropping a become-empty commitElijah Newren2020-03-111-0/+2
* | | | | Merge branch 'en/rebase-backend'Junio C Hamano2020-03-031-31/+51
|\| | | | | |_|/ / |/| | |
| * | | rebase: drop '-i' from the reflog for interactive-based rebasesElijah Newren2020-02-171-4/+4
| * | | rebase, sequencer: remove the broken GIT_QUIET handlingElijah Newren2020-02-171-4/+2
| * | | rebase (interactive-backend): fix handling of commits that become emptyElijah Newren2020-02-171-11/+39
| * | | rebase (interactive-backend): make --keep-empty the defaultElijah Newren2020-02-171-13/+7
* | | | Merge branch 'ag/edit-todo-drop-check'Junio C Hamano2020-02-141-40/+11
|\ \ \ \
| * | | | rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Alban Gruin2020-01-281-11/+11
| * | | | sequencer: move check_todo_list_from_file() to rebase-interactive.cAlban Gruin2020-01-281-29/+0
* | | | | Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano2020-02-141-14/+0
|\ \ \ \ \