index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t3507-cherry-pick-conflict.sh
Age
Commit message (
Expand
)
Author
2014-10-28
merge & sequencer: turn "Conflicts:" hint into a comment
Junio C Hamano
2012-12-23
tests: move test_cmp_rev to test-lib-functions
Martin von Zweigbergk
2012-09-14
cherry-pick: don't forget -s on failure
Miklos Vajna
2012-02-22
cherry-pick: No advice to commit if --no-commit
Phil Hord
2011-11-22
revert: write REVERT_HEAD pseudoref during conflicted revert
Jonathan Nieder
2011-10-06
revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
Jay Soffian
2011-04-13
i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
Junio C Hamano
2011-04-02
Merge branch 'ab/i18n-st'
Junio C Hamano
2011-03-10
i18n: git-revert split up "could not revert/apply" message
Ævar Arnfjörð Bjarmason
2011-02-22
Teach commit about CHERRY_PICK_HEAD
Jay Soffian
2011-02-22
Introduce CHERRY_PICK_HEAD
Jay Soffian
2011-02-22
t3507: introduce pristine-detach helper
Jonathan Nieder
2010-08-18
tests: fix syntax error in "Use advise() for hints" test
Ævar Arnfjörð Bjarmason
2010-08-16
cherry-pick/revert: Use advise() for hints
Jonathan Nieder
2010-04-11
t3507: Make test executable
Stephen Boyd
2010-03-21
cherry-pick, revert: add a label for ancestor
Jonathan Nieder
2010-03-21
revert: clarify label on conflict hunks
Jonathan Nieder
2010-03-21
tests: document cherry-pick behavior in face of conflicts
Jonathan Nieder