summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano2020-01-121-133/+8
* Merge branch 'ag/sequencer-todo-updates'Junio C Hamano2019-12-161-9/+23
|\
| * sequencer: directly call pick_commits() from complete_action()Alban Gruin2019-11-251-4/+10
| * sequencer: move the code writing total_nr on the disk to a new functionAlban Gruin2019-11-251-5/+11
| * sequencer: update `done_nr' when skipping commands in a todo listAlban Gruin2019-11-251-0/+1
| * sequencer: update `total_nr' when adding an item to a todo listAlban Gruin2019-11-251-0/+1
* | Merge branch 'ag/sequencer-continue-leakfix'Junio C Hamano2019-12-101-2/+4
|\ \
| * | sequencer: fix a memory leak in sequencer_continue()Alban Gruin2019-11-301-2/+4
* | | Merge branch 'ra/rebase-i-more-options'Junio C Hamano2019-12-101-8/+133
|\ \ \
| * | | rebase -i: support --ignore-dateRohit Ashiwal2019-11-021-3/+57
| * | | sequencer: rename amend_author to author_to_renameRohit Ashiwal2019-11-021-3/+3
| * | | rebase -i: support --committer-date-is-author-dateRohit Ashiwal2019-11-021-2/+63
| * | | sequencer: allow callers of read_author_script() to ignore fieldsRohit Ashiwal2019-11-021-3/+13
* | | | Merge branch 'sg/assume-no-todo-update-in-cherry-pick'Junio C Hamano2019-12-061-1/+1
|\ \ \ \
| * | | | sequencer: don't re-read todo for revert and cherry-pickSZEDER Gábor2019-11-241-1/+1
| |/ / /
* | | | Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'Junio C Hamano2019-12-051-5/+21
|\ \ \ \
| * | | | sequencer: fix empty commit check when amendingPhillip Wood2019-11-231-5/+21
* | | | | Merge branch 'dd/rebase-merge-reserves-onto-label'Junio C Hamano2019-12-051-0/+5
|\ \ \ \ \
| * | | | | sequencer: handle rebase-merges for "onto" messageDoan Tran Cong Danh2019-11-201-0/+5
* | | | | | Merge branch 'js/rebase-r-safer-label'Junio C Hamano2019-12-051-27/+45
|\ \ \ \ \ \ | |/ / / / /
| * | | | | rebase -r: let `label` generate safer labelsMatthew Rogers2019-11-181-1/+19
| * | | | | rebase-merges: move labels' whitespace mangling into `label_oid()`Johannes Schindelin2019-11-181-28/+28
* | | | | | Merge branch 'dd/sequencer-utf8'Junio C Hamano2019-12-011-7/+14
|\ \ \ \ \ \
| * | | | | | sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh2019-11-111-1/+2
| * | | | | | sequencer: reencode old merge-commit messageDoan Tran Cong Danh2019-11-111-1/+2
| * | | | | | sequencer: reencode squashing commit's messageDoan Tran Cong Danh2019-11-111-3/+5
| * | | | | | sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh2019-11-111-1/+4
| * | | | | | sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh2019-11-111-1/+1
* | | | | | | Merge branch 'en/doc-typofix'Junio C Hamano2019-12-011-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix spelling errors in code commentsElijah Newren2019-11-101-3/+3
| |/ / / / /
* | | | | | Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano2019-11-101-13/+11
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | sequencer: run post-commit hookPhillip Wood2019-10-161-0/+1
| * | | | move run_commit_hook() to libgit and use it therePhillip Wood2019-10-161-13/+10
| |/ / /
* | | | Merge branch 'ew/hashmap'Junio C Hamano2019-10-151-15/+29
|\ \ \ \
| * | | | hashmap: introduce hashmap_free_entriesEric Wong2019-10-071-2/+2
| * | | | hashmap_cmp_fn takes hashmap_entry paramsEric Wong2019-10-071-7/+17
| * | | | hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong2019-10-071-2/+5
| * | | | hashmap_put takes "struct hashmap_entry *"Eric Wong2019-10-071-1/+1
| * | | | hashmap_add takes "struct hashmap_entry *"Eric Wong2019-10-071-1/+1
| * | | | hashmap_entry_init takes "struct hashmap_entry *"Eric Wong2019-10-071-2/+3
| | |/ / | |/| |
* | | | Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2019-10-151-3/+2
|\ \ \ \
| * | | | merge-recursive: don't force external callers to do our loggingElijah Newren2019-08-191-1/+0
| * | | | merge-recursive: remove useless parameter in merge_trees()Elijah Newren2019-08-191-2/+2
| |/ / /
* | | | Merge branch 'pw/rebase-i-show-HEAD-to-reword'Junio C Hamano2019-10-111-91/+39
|\ \ \ \ | | |/ / | |/| |
| * | | sequencer: simplify root commit creationPhillip Wood2019-08-191-71/+4
| * | | rebase -i: check for updated todo after squash and rewordPhillip Wood2019-08-191-15/+27
| * | | rebase -i: always update HEAD before rewordingPhillip Wood2019-08-191-8/+11
| * | | Merge branch 'pw/rebase-abort-clean-rewritten' into maintJunio C Hamano2019-07-291-4/+7
| |\ \ \
* | \ \ \ Merge branch 'bc/object-id-part17'Junio C Hamano2019-10-111-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | sequencer: convert to use the_hash_algobrian m. carlson2019-08-191-3/+3
| | |_|/ | |/| |
View Lorry Controller Status