| Commit message (Expand) | Author | Age | Files | Lines |
* | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hint | Junio C Hamano | 2014-10-28 | 1 | -8/+34 |
* | tests: move test_cmp_rev to test-lib-functions | Martin von Zweigbergk | 2012-12-22 | 1 | -6/+0 |
* | cherry-pick: don't forget -s on failure | Miklos Vajna | 2012-09-14 | 1 | -0/+32 |
* | cherry-pick: No advice to commit if --no-commitph/cherry-pick-advice-refinement | Phil Hord | 2012-02-22 | 1 | -0/+14 |
* | revert: write REVERT_HEAD pseudoref during conflicted revert | Jonathan Nieder | 2011-11-22 | 1 | -0/+54 |
* | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so | Jay Soffian | 2011-10-06 | 1 | -0/+15 |
* | i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 | Junio C Hamano | 2011-04-13 | 1 | -2/+2 |
* | Merge branch 'ab/i18n-st' | Junio C Hamano | 2011-04-01 | 1 | -1/+1 |
|\ |
|
| * | i18n: git-revert split up "could not revert/apply" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
* | | Teach commit about CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 1 | -1/+1 |
* | | Introduce CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 1 | -1/+75 |
* | | t3507: introduce pristine-detach helper | Jonathan Nieder | 2011-02-21 | 1 | -54/+22 |
|/ |
|
* | tests: fix syntax error in "Use advise() for hints" test | Ævar Arnfjörð Bjarmason | 2010-08-18 | 1 | -5/+5 |
* | cherry-pick/revert: Use advise() for hints | Jonathan Nieder | 2010-08-15 | 1 | -0/+20 |
* | t3507: Make test executable | Stephen Boyd | 2010-04-11 | 1 | -0/+0 |
* | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -2/+2 |
* | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 | 1 | -2/+2 |
* | tests: document cherry-pick behavior in face of conflicts | Jonathan Nieder | 2010-03-20 | 1 | -0/+198 |