| commit | aa1a0111cc0e2a12c21ed05c88d8e9872fc166b2 | |
| author | Abhijit Menon-Sen <ams@toroid.org> | |
| Sun, 10 Aug 2008 11:48:55 +0000 (10 17:18 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Aug 2008 23:42:49 +0000 (11 16:42 -0700) | ||
| tree | 2d16c9378afe871dffedcf115c03d69b529d493b | treesnapshot (tar.gz zip) |
| parent | ac39efbdf3d41443c40166b7578b7fb87c2f3b60 | commitdiff |
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>
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>
| builtin-revert.c | diffblobblamehistory | |
| t/t3504-cherry-pick-rerere.sh | [new file with mode: 0755] | blob |