development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity
30605 commits 6 branches 956 tags 491 MiB
Commit graph

2 commits

Author SHA1 Message Date
Jonathan Nieder
a48fcd8369 tests: add missing && 
Breaks in a test assertion's && chain can potentially hide
failures from earlier commands in the chain.

Commands intended to fail should be marked with !, test_must_fail, or
test_might_fail.  The examples in this patch do not require that.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-09 11:59:49 -08:00
Abhijit Menon-Sen
aa1a0111cc Make cherry-pick use rerere for conflict resolution. 
Cherry-picking can be helped by reusing previous confliction
resolution by invoking rerere automatically.

Signed-off-by: Abhijit Menon-Sen <ams@toroid.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-08-11 16:42:49 -07:00