summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2020-03-27Merge branch 'bc/filter-process'Junio C Hamano
2020-03-27Merge branch 'bc/sha-256-part-1-of-4'Junio C Hamano
2020-03-25Merge branch 'pw/advise-rebase-skip'Junio C Hamano
2020-03-16builtin/rebase: compute checkout metadata for rebasesbrian m. carlson
2020-03-12Merge branch 'en/rebase-backend'Junio C Hamano
2020-03-11sequencer: clear state upon dropping a become-empty commitElijah Newren
2020-03-02Merge branch 'en/rebase-backend'Junio C Hamano
2020-02-24commit: use expected signature header for SHA-256brian m. carlson
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesElijah Newren
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingElijah Newren
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyElijah Newren
2020-02-16rebase (interactive-backend): make --keep-empty the defaultElijah Newren
2020-02-14Merge branch 'ag/edit-todo-drop-check'Junio C Hamano
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano
2020-02-14Merge branch 'js/rebase-i-with-colliding-hash'Junio C Hamano
2020-01-29avoid computing zero offsets from NULL pointerJeff King
2020-01-28rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Alban Gruin
2020-01-28sequencer: move check_todo_list_from_file() to rebase-interactive.cAlban Gruin
2020-01-24rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin
2020-01-23rebase -i: re-fix short SHA-1 collisionJohannes Schindelin
2020-01-23parse_insn_line(): improve error message when parsing failedJohannes Schindelin
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano
2019-12-16Merge branch 'ag/sequencer-todo-updates'Junio C Hamano
2019-12-10Merge branch 'ag/sequencer-continue-leakfix'Junio C Hamano
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano
2019-12-06Merge branch 'sg/assume-no-todo-update-in-cherry-pick'Junio C Hamano
2019-12-06commit: give correct advice for empty commit during a rebasePhillip Wood
2019-12-06commit: encapsulate determine_whence() for sequencerPhillip Wood
2019-12-06sequencer: write CHERRY_PICK_HEAD for reword and editPhillip Wood
2019-12-05Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'Junio C Hamano
2019-12-05Merge branch 'dd/rebase-merge-reserves-onto-label'Junio C Hamano
2019-12-05Merge branch 'js/rebase-r-safer-label'Junio C Hamano
2019-12-01Merge branch 'dd/sequencer-utf8'Junio C Hamano
2019-12-01Merge branch 'en/doc-typofix'Junio C Hamano
2019-11-30sequencer: fix a memory leak in sequencer_continue()Alban Gruin
2019-11-25sequencer: directly call pick_commits() from complete_action()Alban Gruin
2019-11-25sequencer: move the code writing total_nr on the disk to a new functionAlban Gruin
2019-11-25sequencer: update `done_nr' when skipping commands in a todo listAlban Gruin
2019-11-25sequencer: update `total_nr' when adding an item to a todo listAlban Gruin
2019-11-24sequencer: don't re-read todo for revert and cherry-pickSZEDER Gábor
2019-11-23sequencer: fix empty commit check when amendingPhillip Wood
2019-11-20sequencer: handle rebase-merges for "onto" messageDoan Tran Cong Danh
2019-11-18rebase -r: let `label` generate safer labelsMatthew Rogers
2019-11-18rebase-merges: move labels' whitespace mangling into `label_oid()`Johannes Schindelin
2019-11-11sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh
2019-11-11sequencer: reencode old merge-commit messageDoan Tran Cong Danh
2019-11-11sequencer: reencode squashing commit's messageDoan Tran Cong Danh
2019-11-11sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh
2019-11-11sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh
2019-11-10Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano