Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-11-09 | tests: add missing && | Jonathan Nieder | |
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> | |||
2008-08-11 | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | |
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> |