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