summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2020-03-17Merge branch 'js/rebase-i-with-colliding-hash' into maintJunio C Hamano-4/+14
2020-01-28avoid computing zero offsets from NULL pointerJeff King-3/+3
2020-01-23rebase -i: re-fix short SHA-1 collisionJohannes Schindelin-1/+10
2020-01-23parse_insn_line(): improve error message when parsing failedJohannes Schindelin-3/+4
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano-133/+8
2019-12-16Merge branch 'ag/sequencer-todo-updates'Junio C Hamano-9/+23
2019-12-10Merge branch 'ag/sequencer-continue-leakfix'Junio C Hamano-2/+4
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano-8/+133
2019-12-06Merge branch 'sg/assume-no-todo-update-in-cherry-pick'Junio C Hamano-1/+1
2019-12-05Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'Junio C Hamano-5/+21
2019-12-05Merge branch 'dd/rebase-merge-reserves-onto-label'Junio C Hamano-0/+5
2019-12-05Merge branch 'js/rebase-r-safer-label'Junio C Hamano-27/+45
2019-12-01Merge branch 'dd/sequencer-utf8'Junio C Hamano-7/+14
2019-12-01Merge branch 'en/doc-typofix'Junio C Hamano-3/+3
2019-11-30sequencer: fix a memory leak in sequencer_continue()Alban Gruin-2/+4
2019-11-25sequencer: directly call pick_commits() from complete_action()Alban Gruin-4/+10
2019-11-25sequencer: move the code writing total_nr on the disk to a new functionAlban Gruin-5/+11
2019-11-25sequencer: update `done_nr' when skipping commands in a todo listAlban Gruin-0/+1
2019-11-25sequencer: update `total_nr' when adding an item to a todo listAlban Gruin-0/+1
2019-11-24sequencer: don't re-read todo for revert and cherry-pickSZEDER Gábor-1/+1
2019-11-23sequencer: fix empty commit check when amendingPhillip Wood-5/+21
2019-11-20sequencer: handle rebase-merges for "onto" messageDoan Tran Cong Danh-0/+5
2019-11-18rebase -r: let `label` generate safer labelsMatthew Rogers-1/+19
2019-11-18rebase-merges: move labels' whitespace mangling into `label_oid()`Johannes Schindelin-28/+28
2019-11-11sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh-1/+2
2019-11-11sequencer: reencode old merge-commit messageDoan Tran Cong Danh-1/+2
2019-11-11sequencer: reencode squashing commit's messageDoan Tran Cong Danh-3/+5
2019-11-11sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh-1/+4
2019-11-11sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh-1/+1
2019-11-10Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano-13/+11
2019-11-10Fix spelling errors in code commentsElijah Newren-3/+3
2019-11-02rebase -i: support --ignore-dateRohit Ashiwal-3/+57
2019-11-02sequencer: rename amend_author to author_to_renameRohit Ashiwal-3/+3
2019-11-02rebase -i: support --committer-date-is-author-dateRohit Ashiwal-2/+63
2019-11-02sequencer: allow callers of read_author_script() to ignore fieldsRohit Ashiwal-3/+13
2019-10-16sequencer: run post-commit hookPhillip Wood-0/+1
2019-10-16move run_commit_hook() to libgit and use it therePhillip Wood-13/+10
2019-10-15Merge branch 'ew/hashmap'Junio C Hamano-15/+29
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano-3/+2
2019-10-11Merge branch 'pw/rebase-i-show-HEAD-to-reword'Junio C Hamano-91/+39
2019-10-11Merge branch 'bc/object-id-part17'Junio C Hamano-3/+3
2019-10-07hashmap: introduce hashmap_free_entriesEric Wong-2/+2
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsEric Wong-7/+17
2019-10-07hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong-2/+5
2019-10-07hashmap_put takes "struct hashmap_entry *"Eric Wong-1/+1
2019-10-07hashmap_add takes "struct hashmap_entry *"Eric Wong-1/+1
2019-10-07hashmap_entry_init takes "struct hashmap_entry *"Eric Wong-2/+3
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano-3/+15
2019-08-19sequencer: simplify root commit creationPhillip Wood-71/+4
2019-08-19rebase -i: check for updated todo after squash and rewordPhillip Wood-15/+27