diff options
| author | Abhijit Menon-Sen <ams@toroid.org> | 2008-08-10 17:18:55 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-11 16:42:49 -0700 |
| commit | aa1a0111cc0e2a12c21ed05c88d8e9872fc166b2 (patch) | |
| tree | 2d16c9378afe871dffedcf115c03d69b529d493b /bundle.h | |
| parent | ac39efbdf3d41443c40166b7578b7fb87c2f3b60 (diff) | |
| download | git-aa1a0111cc0e2a12c21ed05c88d8e9872fc166b2.tar.gz git-aa1a0111cc0e2a12c21ed05c88d8e9872fc166b2.tar.xz | |
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>
Diffstat (limited to 'bundle.h')
0 files changed, 0 insertions, 0 deletions