summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'pw/rebase-i-regression-fix'Junio C Hamano2017-05-291-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | rebase -i: add missing newline to end of messagepw/rebase-i-regression-fixPhillip Wood2017-05-201-1/+1
| * | | rebase -i: silence stash applyPhillip Wood2017-05-201-0/+2
| * | | rebase -i: fix reflog messagePhillip Wood2017-05-201-0/+1
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-29/+30
|\ \ \ \
| * | | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | | sequencer: convert do_recursive_merge to struct object_idbrian m. carlson2017-05-081-3/+3
| * | | | merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | | sequencer: convert fast_forward_to to struct object_idbrian m. carlson2017-05-081-11/+11
| * | | | Convert lookup_tree to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-4/+4
| * | | | Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson2017-05-081-10/+10
| * | | | sequencer: convert some functions to struct object_idbrian m. carlson2017-05-081-6/+6
| * | | | Convert struct cache_tree to use struct object_idbrian m. carlson2017-05-021-1/+2
| | |/ / | |/| |
* | | | Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano2017-05-161-7/+4
|\ \ \ \ | |/ / / |/| | |
| * | | sequencer: add newline before adding footersjt/use-trailer-api-in-commandsJonathan Tan2017-04-261-7/+4
* | | | Merge branch 'sh/rebase-i-reread-todo-after-exec'Junio C Hamano2017-05-011-0/+22
|\ \ \ \
| * | | | rebase -i: reread the todo list if `exec` touched itsh/rebase-i-reread-todo-after-execStephen Hicks2017-04-271-0/+22
* | | | | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-261-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | use git_path_* helper functionsJeff King2017-04-201-6/+6
| | |_|/ | |/| |
* | | | Merge branch 'js/rebase-i-reword-to-run-hooks'Junio C Hamano2017-03-301-23/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | sequencer: allow the commit-msg hooks to run during a `reword`js/rebase-i-reword-to-run-hooksJohannes Schindelin2017-03-271-2/+6
| * | | sequencer: make commit options more extensibleJohannes Schindelin2017-03-271-22/+26
* | | | sequencer: fix missing newlinejs/rebase-helperBrandon Williams2017-03-231-1/+1
|/ / /
* | | sequencer: drop "warning:" when stopping for editJeff King2017-03-171-1/+2
|/ /
* | sequencer (rebase -i): write out the final messagejs/sequencer-i-countdown-3Johannes Schindelin2017-01-171-0/+3
* | sequencer (rebase -i): write the progress into filesJohannes Schindelin2017-01-171-3/+27
* | sequencer (rebase -i): show the progressJohannes Schindelin2017-01-171-0/+32
* | sequencer (rebase -i): suggest --edit-todo upon unknown commandJohannes Schindelin2017-01-171-1/+5
* | sequencer (rebase -i): show only failed cherry-picks' outputJohannes Schindelin2017-01-171-0/+4
* | sequencer (rebase -i): show only failed `git commit`'s outputJohannes Schindelin2017-01-171-0/+18
* | sequencer: use run_command() directlyJohannes Schindelin2017-01-171-20/+16
* | sequencer: update reading author-scriptJohannes Schindelin2017-01-171-22/+12
* | sequencer (rebase -i): differentiate between comments and 'noop'Johannes Schindelin2017-01-091-6/+9
* | sequencer (rebase -i): implement the 'drop' commandJohannes Schindelin2017-01-091-3/+5
* | sequencer (rebase -i): allow rescheduling commandsJohannes Schindelin2017-01-091-0/+6
* | sequencer (rebase -i): respect strategy/strategy_opts settingsJohannes Schindelin2017-01-091-1/+25
* | sequencer (rebase -i): respect the rebase.autostash settingJohannes Schindelin2017-01-091-0/+43
* | sequencer (rebase -i): run the post-rewrite hook, if neededJohannes Schindelin2017-01-091-0/+14
* | sequencer (rebase -i): record interrupted commits in rewritten, tooJohannes Schindelin2017-01-091-0/+8
* | sequencer (rebase -i): copy commit notes at endJohannes Schindelin2017-01-091-0/+76
* | sequencer (rebase -i): set the reflog message consistentlyJohannes Schindelin2017-01-091-0/+4
* | sequencer (rebase -i): refactor setting the reflog messageJohannes Schindelin2017-01-091-7/+26
* | sequencer (rebase -i): allow fast-forwarding for edit/rewordJohannes Schindelin2017-01-091-8/+17
* | sequencer (rebase -i): implement the 'reword' commandJohannes Schindelin2017-01-091-2/+7
* | sequencer (rebase -i): leave a patch upon errorJohannes Schindelin2017-01-091-1/+3
* | sequencer (rebase -i): update refs after a successful rebaseJohannes Schindelin2017-01-091-1/+45
* | sequencer (rebase -i): the todo can be empty when continuingJohannes Schindelin2017-01-091-2/+5
* | sequencer (rebase -i): skip some revert/cherry-pick specific code pathJohannes Schindelin2017-01-091-12/+14
* | sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer neededJohannes Schindelin2017-01-091-1/+6
View Lorry Controller Status