summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* sequencer (rebase -i): allow continuing with staged changesJohannes Schindelin2017-01-091-0/+40
* sequencer (rebase -i): write an author-script fileJohannes Schindelin2017-01-091-1/+49
* sequencer (rebase -i): implement the short commandsJohannes Schindelin2017-01-091-14/+21
* sequencer (rebase -i): add support for the 'fixup' and 'squash' commandsJohannes Schindelin2017-01-091-10/+217
* sequencer (rebase -i): write the 'done' fileJohannes Schindelin2017-01-091-0/+23
* sequencer (rebase -i): learn about the 'verbose' modeJohannes Schindelin2017-01-091-0/+28
* sequencer (rebase -i): implement the 'exec' commandJohannes Schindelin2017-01-091-0/+57
* sequencer (rebase -i): implement the 'edit' commandJohannes Schindelin2017-01-091-3/+114
* sequencer (rebase -i): implement the 'noop' commandJohannes Schindelin2017-01-091-3/+36
* sequencer: support a new action: 'interactive rebase'Johannes Schindelin2017-01-091-4/+32
* sequencer: use a helper to find the commit messageJohannes Schindelin2017-01-091-8/+3
* sequencer: move "else" keyword onto the same line as preceding braceJohannes Schindelin2017-01-091-2/+1
* sequencer: avoid unnecessary curly bracesJohannes Schindelin2017-01-091-2/+1
* Merge branch 'sb/sequencer-abort-safety'Junio C Hamano2016-12-211-0/+49
|\
| * Revert "sequencer: remove useless get_dir() function"sb/sequencer-abort-safetyJunio C Hamano2016-12-141-1/+6
| * sequencer: remove useless get_dir() functionStephan Beyer2016-12-091-6/+1