diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-27 16:40:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-27 16:40:09 -0700 |
| commit | 88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31 (patch) | |
| tree | b4550d79e5f34a8817ea787b299cabf8174c81c6 /Documentation/git-checkout-index.txt | |
| parent | Merge branch 'jc/add-addremove' (diff) | |
| parent | Make cherry-pick use rerere for conflict resolution. (diff) | |
| download | tgif-88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31.tar.xz | |
Merge branch 'am/cherry-pick-rerere'
* am/cherry-pick-rerere:
Make cherry-pick use rerere for conflict resolution.
Diffstat (limited to 'Documentation/git-checkout-index.txt')
0 files changed, 0 insertions, 0 deletions