]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3504-cherry-pick-rerere.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ac39efb) | patch
Make cherry-pick use rerere for conflict resolution.
authorAbhijit Menon-Sen <ams@toroid.org>
Sun, 10 Aug 2008 11:48:55 +0000 (17:18 +0530)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Aug 2008 23:42:49 +0000 (16:42 -0700)
commitaa1a0111cc0e2a12c21ed05c88d8e9872fc166b2
tree2d16c9378afe871dffedcf115c03d69b529d493btree | snapshot
parentac39efbdf3d41443c40166b7578b7fb87c2f3b60commit | diff
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>
builtin-revert.c diff | blob | blame | history
t/t3504-cherry-pick-rerere.sh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.