summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|/ | |/| |
* | | | Merge branch 'js/rebase-r-strategy'Junio C Hamano2019-09-181-3/+15
|\ \ \ \ | |/ / / |/| | |
| * | | rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Johannes Schindelin2019-07-311-1/+3
| * | | rebase -r: support merge strategies other than `recursive`Johannes Schindelin2019-07-311-2/+12
| * | | sequencer: the `am` and `rebase--interactive` scripts are goneJohannes Schindelin2019-07-311-1/+1
* | | | Merge branch 'nd/tree-walk-with-repo'Junio C Hamano2019-07-191-3/+3
|\ \ \ \
| * | | | Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy2019-06-271-2/+2
| * | | | tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy2019-06-271-1/+1
* | | | | Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano2019-07-191-15/+119
|\ \ \ \ \
| * | | | | cherry-pick/revert: advise using --skipRohit Ashiwal2019-07-021-3/+6
| * | | | | cherry-pick/revert: add --skip optionRohit Ashiwal2019-07-021-0/+73
| * | | | | sequencer: use argv_array in reset_mergeRohit Ashiwal2019-07-021-6/+11
| * | | | | sequencer: rename reset_for_rollback to reset_mergeRohit Ashiwal2019-07-021-3/+3
| * | | | | sequencer: add advice for revertRohit Ashiwal2019-07-021-6/+29
| |/ / / /
* | | | | Merge branch 'pw/status-with-corrupt-sequencer-state'Junio C Hamano2019-07-191-22/+21
|\ \ \ \ \
| * | | | | status: do not report errors in sequencer/todoPhillip Wood2019-06-271-16/+8
| * | | | | sequencer: factor out todo command name parsingPhillip Wood2019-06-271-6/+13
| * | | | | sequencer: always allow tab after command namePhillip Wood2019-06-271-1/+1
| | |/ / / | |/| | |
View Lorry Controller Status