summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2020-05-14Merge branch 'js/rebase-autosquash-double-fixup-fix'Junio C Hamano
2020-05-09rebase --autosquash: fix a potential segfaultJohannes Schindelin
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano
2020-04-22Merge branch 'en/rebase-no-keep-empty'Junio C Hamano
2020-04-22Merge branch 'dd/no-gpg-sign'Junio C Hamano
2020-04-22Merge branch 'en/sequencer-reflog-action'Junio C Hamano
2020-04-22Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'Junio C Hamano
2020-04-11rebase --merge: optionally skip upstreamed commitsJonathan Tan
2020-04-11rebase: reinstate --no-keep-emptyElijah Newren
2020-04-11rebase -i: mark commits that begin empty in todo editorElijah Newren
2020-04-10sequencer: implement apply_autostash_oid()Denton Liu
2020-04-10sequencer: implement save_autostash()Denton Liu
2020-04-10sequencer: unlink autostash in apply_autostash()Denton Liu
2020-04-10sequencer: extract perform_autostash() from rebaseDenton Liu
2020-04-10rebase: use apply_autostash() from sequencer.cDenton Liu
2020-04-10sequencer: rename stash_sha1 to stash_oidDenton Liu
2020-04-10sequencer: make apply_autostash() accept a pathDenton Liu
2020-04-07sequencer: make read_oneliner() externDenton Liu
2020-04-07sequencer: configurably warn on non-existent filesDenton Liu
2020-04-07sequencer: make read_oneliner() accept flagsDenton Liu
2020-04-07sequencer: make file exists check more efficientDenton Liu
2020-04-07sequencer: honor GIT_REFLOG_ACTIONElijah Newren
2020-04-05sequencer: stop leaking bufDenton Liu
2020-04-03cherry-pick/revert: honour --no-gpg-sign in all caseĐoàn Trần Công Danh
2020-03-30sequencer: don't abbreviate a command if it doesn't have a short formAlban Gruin
2020-03-29sequencer: mark messages for translationAlban Gruin
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