kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
18,859 Commits
6 Branches
996 Tags
177 MiB
Commit Graph

1 Commits (e3a0ca878457ecc70d0065802fcb0c6875c6b671)

Author SHA1 Message Date
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