development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 10:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
19313 commits 6 branches 951 tags 697 MiB
Commit graph

1 commit

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