Commit Graph

144 Commits (bcd020f88e1e22f38422ac3f73ab06b34ec4bef1)

Author SHA1 Message Date
Phillip Wood b7de153bd9 create_autostash(): remove unneeded parameter 10 months ago
Ævar Arnfjörð Bjarmason f69a6e4f07 *.h: move some *_INIT to designated initializers 1 year ago
Phillip Wood 2b88fe0603 rebase: fix todo-list rereading 1 year ago
Johannes Schindelin 17919c3585 sequencer: restrict scope of a formerly public function 1 year ago
Josh Steadmon 767a4ca648 sequencer: advise if skipping cherry-picked commit 1 year ago
Elijah Newren 39edfd5cbc sequencer: fix edit handling for cherry-pick and revert messages 2 years ago
Phillip Wood a2bb10d06d rebase -i: use struct object_id when writing state 2 years ago
Phillip Wood f3e27a02d5 rebase -i: use struct object_id rather than looking up commit 2 years ago
Elijah Newren 14c4586c2d merge,rebase,revert: select ort or recursive by config or environment 2 years ago
Jeff King 2020451c5b am, sequencer: stop parsing our own committer ident 2 years ago
Phillip Wood a3894aad67 rebase -i: support --ignore-date 2 years ago
Phillip Wood 7573cec52c rebase -i: support --committer-date-is-author-date 2 years ago
Jonathan Tan 0fcb4f6b62 rebase --merge: optionally skip upstreamed commits 3 years ago
Elijah Newren b9cbd2958f rebase: reinstate --no-keep-empty 3 years ago
Denton Liu 804fe31557 sequencer: implement apply_autostash_oid() 3 years ago
Denton Liu 12b6e1367a sequencer: implement save_autostash() 3 years ago
Denton Liu 0816f1dff8 sequencer: extract perform_autostash() from rebase 3 years ago
Denton Liu 86ed00aff4 rebase: use apply_autostash() from sequencer.c 3 years ago
Denton Liu c20de8bec6 sequencer: make read_oneliner() extern 3 years ago
Elijah Newren e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty 3 years ago
Elijah Newren d48e5e21da rebase (interactive-backend): make --keep-empty the default 3 years ago
Alban Gruin 5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 3 years ago
Alban Gruin 1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c 3 years ago
Alban Gruin 767a9c417e rebase -i: stop checking out the tip of the branch to rebase 3 years ago
Junio C Hamano 4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'" 3 years ago
Phillip Wood 901ba7b1ef commit: encapsulate determine_whence() for sequencer 3 years ago
Rohit Ashiwal 08187b4cba rebase -i: support --ignore-date 3 years ago
Rohit Ashiwal cbd8db17ac rebase -i: support --committer-date-is-author-date 3 years ago
Phillip Wood 12bb7a540a sequencer.h fix placement of #endif 3 years ago
Johannes Schindelin e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` 3 years ago
Rohit Ashiwal de81ca3f36 cherry-pick/revert: add --skip option 3 years ago
Phillip Wood 7d3488eb89 rebase -i: use struct commit when parsing options 4 years ago
Phillip Wood fc4a6735ee sequencer: always discard index after checkout 4 years ago
Denton Liu 1a2b985fb3 cherry-pick/revert: add scissors line on merge conflict 4 years ago
Denton Liu f29cd8620d commit: extract cleanup_mode functions to sequencer 4 years ago
Phillip Wood d74f3e5811 sequencer: fix cleanup with --signoff and -x 4 years ago
Phillip Wood 4a72486de9 fix cherry-pick/revert status after commit 4 years ago
Phillip Wood b07d9bfd17 commit/reset: try to clean up sequencer state 4 years ago
Alban Gruin f2a04904be sequencer: refactor rearrange_squash() to work on a todo_list 4 years ago
Alban Gruin ed35d18841 rebase--interactive: move transform_todo_file() 4 years ago
Alban Gruin 683153a438 sequencer: refactor sequencer_add_exec_commands() to work on a todo_list 4 years ago
Alban Gruin a930eb03a8 rebase-interactive: rewrite edit_todo_list() to handle the initial edit 4 years ago
Alban Gruin ddb81e5072 rebase-interactive: use todo_list_write_to_file() in edit_todo_list() 4 years ago
Alban Gruin 79d7e883bb rebase--interactive: move rearrange_squash_in_todo_file() 4 years ago
Alban Gruin 1ba204de69 rebase--interactive: move sequencer_add_exec_commands() 4 years ago
Alban Gruin 94bcad7979 sequencer: change complete_action() to use the refactored functions 4 years ago
Alban Gruin d358fc286d sequencer: make sequencer_make_script() write its script to a strbuf 4 years ago
Ramsay Jones 5fe81438b5 sequencer: make sign_off_header a file local symbol 4 years ago
Alban Gruin 6ca89c6f39 sequencer: refactor check_todo_list() to work on a todo_list 4 years ago
Alban Gruin 616d7740cf sequencer: introduce todo_list_write_to_file() 4 years ago