aboutsummaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAge
* Merge branch 'bc/object-id'Junio C Hamano2017-05-23
|\
| * tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-08
| * sequencer: convert do_recursive_merge to struct object_idbrian m. carlson2017-05-08
| * merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-08
| * sequencer: convert fast_forward_to to struct object_idbrian m. carlson2017-05-08
| * Convert lookup_tree to struct object_idbrian m. carlson2017-05-08
| * Convert lookup_commit* to struct object_idbrian m. carlson2017-05-08
| * Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson2017-05-08
| * sequencer: convert some functions to struct object_idbrian m. carlson2017-05-08
| * Convert struct cache_tree to use struct object_idbrian m. carlson2017-05-02
* | Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano2017-05-16
|\ \ | |/ |/|
| * sequencer: add newline before adding footersJonathan Tan2017-04-26
* | Merge branch 'sh/rebase-i-reread-todo-after-exec'Junio C Hamano2017-05-01
|\ \
| * | rebase -i: reread the todo list if `exec` touched itStephen Hicks2017-04-27
* | | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-26
|\ \ \ | |/ / |/| |
| * | use git_path_* helper functionsJeff King2017-04-20
* | | Merge branch 'js/rebase-i-reword-to-run-hooks'Junio C Hamano2017-03-30
|\ \ \
| * | | sequencer: allow the commit-msg hooks to run during a `reword`Johannes Schindelin2017-03-27
| * | | sequencer: make commit options more extensibleJohannes Schindelin2017-03-27
* | | | sequencer: fix missing newlineBrandon Williams2017-03-23
|/ / /
* | | sequencer: drop "warning:" when stopping for editJeff King2017-03-17
|/ /
* | sequencer (rebase -i): write out the final messageJohannes Schindelin2017-01-17
* | sequencer (rebase -i): write the progress into filesJohannes Schindelin2017-01-17
* | sequencer (rebase -i): show the progressJohannes Schindelin2017-01-17
* | sequencer (rebase -i): suggest --edit-todo upon unknown commandJohannes Schindelin2017-01-17
* | sequencer (rebase -i): show only failed cherry-picks' outputJohannes Schindelin2017-01-17
* | sequencer (rebase -i): show only failed `git commit`'s outputJohannes Schindelin2017-01-17
* | sequencer: use run_command() directlyJohannes Schindelin2017-01-17
* | sequencer: update reading author-scriptJohannes Schindelin2017-01-17
* | sequencer (rebase -i): differentiate between comments and 'noop'Johannes Schindelin2017-01-09
* | sequencer (rebase -i): implement the 'drop' commandJohannes Schindelin2017-01-09
* | sequencer (rebase -i): allow rescheduling commandsJohannes Schindelin2017-01-09
* | sequencer (rebase -i): respect strategy/strategy_opts settingsJohannes Schindelin2017-01-09
* | sequencer (rebase -i): respect the rebase.autostash settingJohannes Schindelin2017-01-09
* | sequencer (rebase -i): run the post-rewrite hook, if neededJohannes Schindelin2017-01-09
* | sequencer (rebase -i): record interrupted commits in rewritten, tooJohannes Schindelin2017-01-09
* | sequencer (rebase -i): copy commit notes at endJohannes Schindelin2017-01-09
* | sequencer (rebase -i): set the reflog message consistentlyJohannes Schindelin2017-01-09
* | sequencer (rebase -i): refactor setting the reflog messageJohannes Schindelin2017-01-09
* | sequencer (rebase -i): allow fast-forwarding for edit/rewordJohannes Schindelin2017-01-09
* | sequencer (rebase -i): implement the 'reword' commandJohannes Schindelin2017-01-09
* | sequencer (rebase -i): leave a patch upon errorJohannes Schindelin2017-01-09
* | sequencer (rebase -i): update refs after a successful rebaseJohannes Schindelin2017-01-09
* | sequencer (rebase -i): the todo can be empty when continuingJohannes Schindelin2017-01-09
* | sequencer (rebase -i): skip some revert/cherry-pick specific code pathJohannes Schindelin2017-01-09
* | sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer neededJohannes Schindelin2017-01-09
* | sequencer (rebase -i): allow continuing with staged changesJohannes Schindelin2017-01-09
* | sequencer (rebase -i): write an author-script fileJohannes Schindelin2017-01-09
* | sequencer (rebase -i): implement the short commandsJohannes Schindelin2017-01-09
* | sequencer (rebase -i): add support for the 'fixup' and 'squash' commandsJohannes Schindelin2017-01-09