aboutsummaryrefslogtreecommitdiff
path: root/sequencer.h
Commit message (Expand)AuthorAge
* Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-10
|\
| * merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-24
* | cherry-pick, revert: add the --gpg-sign optionNicolas Vigier2014-01-27
|/
* sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey2013-02-12
* Merge branch 'jc/make-static'Junio C Hamano2012-09-18
|\
| * sequencer.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-15
* | cherry-pick: don't forget -s on failureMiklos Vajna2012-09-14
|/
* cherry-pick: add --allow-empty-message optionChris Webb2012-08-06
* git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-24
* git-cherry-pick: add allow-empty optionNeil Horman2012-04-11
* sequencer: factor code out of revert builtinRamkumar Ramachandra2012-01-11
* revert: stop creating and removing sequencer-old directoryJonathan Nieder2011-12-12
* revert: rename --reset option to --quitJonathan Nieder2011-11-22
* revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra2011-08-04