summaryrefslogtreecommitdiff
path: root/sequencer.h
AgeCommit message (Expand)AuthorFilesLines
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreLibravatar Junio C Hamano1-0/+1
2014-10-24merge & sequencer: unify codepaths that write "Conflicts:" hintLibravatar Junio C Hamano1-0/+1
2014-01-27cherry-pick, revert: add the --gpg-sign optionLibravatar Nicolas Vigier1-0/+2
2013-02-12sequencer.c: teach append_signoff how to detect duplicate s-o-bLibravatar Brandon Casey1-1/+3
2012-09-18Merge branch 'jc/make-static'Libravatar Junio C Hamano1-3/+0
2012-09-15sequencer.c: mark a private file-scope symbol as staticLibravatar Junio C Hamano1-3/+0
2012-09-14cherry-pick: don't forget -s on failureLibravatar Miklos Vajna1-0/+4
2012-08-06cherry-pick: add --allow-empty-message optionLibravatar Chris Webb1-0/+1
2012-04-24git-cherry-pick: Add keep-redundant-commits optionLibravatar Neil Horman1-0/+1
2012-04-11git-cherry-pick: add allow-empty optionLibravatar Neil Horman1-0/+1
2012-01-11sequencer: factor code out of revert builtinLibravatar Ramkumar Ramachandra1-0/+37
2011-12-12revert: stop creating and removing sequencer-old directoryLibravatar Jonathan Nieder1-10/+2
2011-11-22revert: rename --reset option to --quitLibravatar Jonathan Nieder1-1/+1
2011-08-04revert: Introduce --reset to remove sequencer stateLibravatar Ramkumar Ramachandra1-0/+20