diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:13:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:13:01 -0800 |
| commit | 4a88fb7ffc32bdfdfab2605430514d92aba25b8a (patch) | |
| tree | 77d37de207313b760eb08c502be1ea98a18351e9 /fast-import.c | |
| parent | 26b9f5cc99a35d4f678c2f565e48237fc9515444 (diff) | |
| parent | cb6020bb017405cc3e7f1faea6f30d4fd1b62e70 (diff) | |
| download | git-4a88fb7ffc32bdfdfab2605430514d92aba25b8a.tar.gz | |
Merge branch 'jc/rerere'
* jc/rerere:
Teach --[no-]rerere-autoupdate option to merge, revert and friends
Diffstat (limited to 'fast-import.c')
0 files changed, 0 insertions, 0 deletions