summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Libravatar Junio C Hamano1-1/+2
2020-04-22Merge branch 'en/rebase-no-keep-empty'Libravatar Junio C Hamano1-0/+11
2020-04-22Merge branch 'dd/no-gpg-sign'Libravatar Junio C Hamano1-0/+2
2020-04-22Merge branch 'en/sequencer-reflog-action'Libravatar Junio C Hamano1-2/+8
2020-04-22Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'Libravatar Junio C Hamano1-3/+6
2020-04-11rebase --merge: optionally skip upstreamed commitsLibravatar Jonathan Tan1-1/+2
2020-04-11rebase: reinstate --no-keep-emptyLibravatar Elijah Newren1-0/+6
2020-04-11rebase -i: mark commits that begin empty in todo editorLibravatar Elijah Newren1-0/+5
2020-04-07sequencer: honor GIT_REFLOG_ACTIONLibravatar Elijah Newren1-2/+8
2020-04-03cherry-pick/revert: honour --no-gpg-sign in all caseLibravatar Đoàn Trần Công Danh1-0/+2
2020-03-30sequencer: don't abbreviate a command if it doesn't have a short formLibravatar Alban Gruin1-3/+6
2020-03-28sequencer: mark messages for translationLibravatar Alban Gruin1-3/+3
2020-03-26Merge branch 'bc/filter-process'Libravatar Junio C Hamano1-0/+1
2020-03-26Merge branch 'bc/sha-256-part-1-of-4'Libravatar Junio C Hamano1-1/+1
2020-03-25Merge branch 'pw/advise-rebase-skip'Libravatar Junio C Hamano1-8/+44
2020-03-16builtin/rebase: compute checkout metadata for rebasesLibravatar brian m. carlson1-0/+1
2020-03-12Merge branch 'en/rebase-backend'Libravatar Junio C Hamano1-0/+2
2020-03-11sequencer: clear state upon dropping a become-empty commitLibravatar Elijah Newren1-0/+2
2020-03-02Merge branch 'en/rebase-backend'Libravatar Junio C Hamano1-31/+51
2020-02-24commit: use expected signature header for SHA-256Libravatar brian m. carlson1-1/+1
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesLibravatar Elijah Newren1-4/+4
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingLibravatar Elijah Newren1-4/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyLibravatar Elijah Newren1-11/+39
2020-02-16rebase (interactive-backend): make --keep-empty the defaultLibravatar Elijah Newren1-13/+7
2020-02-14Merge branch 'ag/edit-todo-drop-check'Libravatar Junio C Hamano1-40/+11
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Libravatar Junio C Hamano1-14/+0
2020-02-14Merge branch 'js/rebase-i-with-colliding-hash'Libravatar Junio C Hamano1-4/+14
2020-01-28avoid computing zero offsets from NULL pointerLibravatar Jeff King1-3/+3
2020-01-28rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Libravatar Alban Gruin1-11/+11
2020-01-28sequencer: move check_todo_list_from_file() to rebase-interactive.cLibravatar Alban Gruin1-29/+0
2020-01-24rebase -i: stop checking out the tip of the branch to rebaseLibravatar Alban Gruin1-14/+0
2020-01-23rebase -i: re-fix short SHA-1 collisionLibravatar Johannes Schindelin1-1/+10
2020-01-23parse_insn_line(): improve error message when parsing failedLibravatar Johannes Schindelin1-3/+4
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Libravatar Junio C Hamano1-133/+8
2019-12-16Merge branch 'ag/sequencer-todo-updates'Libravatar Junio C Hamano1-9/+23
2019-12-10Merge branch 'ag/sequencer-continue-leakfix'Libravatar Junio C Hamano1-2/+4
2019-12-10Merge branch 'ra/rebase-i-more-options'Libravatar Junio C Hamano1-8/+133
2019-12-06Merge branch 'sg/assume-no-todo-update-in-cherry-pick'Libravatar Junio C Hamano1-1/+1
2019-12-06commit: give correct advice for empty commit during a rebaseLibravatar Phillip Wood1-8/+31
2019-12-06commit: encapsulate determine_whence() for sequencerLibravatar Phillip Wood1-1/+12
2019-12-06sequencer: write CHERRY_PICK_HEAD for reword and editLibravatar Phillip Wood1-1/+3
2019-12-05Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'Libravatar Junio C Hamano1-5/+21
2019-12-05Merge branch 'dd/rebase-merge-reserves-onto-label'Libravatar Junio C Hamano1-0/+5
2019-12-05Merge branch 'js/rebase-r-safer-label'Libravatar Junio C Hamano1-27/+45
2019-12-01Merge branch 'dd/sequencer-utf8'Libravatar Junio C Hamano1-7/+14
2019-12-01Merge branch 'en/doc-typofix'Libravatar Junio C Hamano1-3/+3
2019-11-30sequencer: fix a memory leak in sequencer_continue()Libravatar Alban Gruin1-2/+4
2019-11-25sequencer: directly call pick_commits() from complete_action()Libravatar Alban Gruin1-4/+10
2019-11-25sequencer: move the code writing total_nr on the disk to a new functionLibravatar Alban Gruin1-5/+11
2019-11-25sequencer: update `done_nr' when skipping commands in a todo listLibravatar Alban Gruin1-0/+1