aboutsummaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAge
* Sync with 'maint'Junio C Hamano2013-04-12
|\
| * Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-12
* | Merge branch 'bc/append-signed-off-by'Junio C Hamano2013-04-01
|\ \ | |/ |/|
| * git-commit: populate the edit buffer with 2 blank lines before s-o-bBrandon Casey2013-02-23
| * sequencer.c: teach append_signoff to avoid adding a duplicate newlineBrandon Casey2013-02-12
| * sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey2013-02-12
| * sequencer.c: always separate "(cherry picked from" from commit bodyBrandon Casey2013-02-12
| * sequencer.c: require a conforming footer to be preceded by a blank lineBrandon Casey2013-02-12
| * sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footerBrandon Casey2013-02-12
| * commit, cherry-pick -s: remove broken support for multiline rfc2822 fieldsBrandon Casey2013-02-12
| * sequencer.c: rework search for start of footer to improve clarityJonathan Nieder2013-02-12
* | learn to pick/revert into unborn branchMartin von Zweigbergk2012-12-23
|/
* Merge branch 'jc/same-encoding'Junio C Hamano2012-11-15
|\
| * reencode_string(): introduce and use same_encoding()Junio C Hamano2012-11-04
* | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-29
* | 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
|/ /
* | Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-10
|\ \ | |/
| * cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-30
* | cherry-pick: add --allow-empty-message optionChris Webb2012-08-06
|/
* Merge branch 'nh/empty-rebase'Junio C Hamano2012-06-01
|\
| * cherry-pick: regression fix for empty commitsJunio C Hamano2012-05-29
* | Merge branch 'nh/empty-rebase'Junio C Hamano2012-05-07
|\ \ | |/
| * git cherry-pick: do not dereference a potential NULL pointerNeil Horman2012-05-03
* | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-30
|\ \ | |/
| * git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-24
| * git-cherry-pick: add allow-empty optionNeil Horman2012-04-11
* | Merge branch 'rs/commit-list-append'Junio C Hamano2012-04-29
|\ \
| * | sequencer: export commit_list_append()René Scharfe2012-04-25
* | | Merge branch 'rt/cherry-revert-conflict-summary'Junio C Hamano2012-04-27
|\ \ \ | |/ / |/| |
| * | sequencer: remove additional blank lineRalf Thielow2012-04-19
| |/
* | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-23
|/
* cherry-pick: No advice to commit if --no-commitPhil Hord2012-02-22
* Merge branch 'rr/sequencer'Junio C Hamano2012-01-31
|\
| * sequencer: factor code out of revert builtinRamkumar Ramachandra2012-01-11
|/
* revert: stop creating and removing sequencer-old directoryJonathan Nieder2011-12-12
* revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra2011-08-04