diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:08:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:08:14 -0700 |
| commit | 69d61daec7a7915f6a664f32002fd9403e7f2a34 (patch) | |
| tree | 5a82a51e9938eb7154642a5bfc82f84c9e33f44b /t/t3507-cherry-pick-conflict.sh | |
| parent | test: skip clean-up when running under --immediate mode (diff) | |
| parent | Merge branch 'maint-1.7.3' into maint-1.7.4 (diff) | |
| download | tgif-69d61daec7a7915f6a664f32002fd9403e7f2a34.tar.xz | |
Merge branch 'maint-1.7.4' into maint-1.7.5
* maint-1.7.4:
make the sample pre-commit hook script reject names with newlines, too
Reindent closing bracket using tab instead of spaces
Documentation/git-update-index: refer to 'ls-files'
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions