diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:11 -0700 |
| commit | c3e034f0f0753126494285d1098e1084ec05d2c4 (patch) | |
| tree | 9dc1354338380723e493c472242e8ad6ac25911f /Documentation/git-mergetool.txt | |
| parent | Merge branch 'sb/sha1-file-cleanup' (diff) | |
| parent | commit: skip discarding the index if there is no pre-commit hook (diff) | |
| download | tgif-c3e034f0f0753126494285d1098e1084ec05d2c4.tar.xz | |
Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'
"git commit" used to discard the index and re-read from the filesystem
just in case the pre-commit hook has updated it in the middle; this
has been optimized out when we know we do not run the pre-commit hook.
* kw/commit-keep-index-when-pre-commit-is-not-run:
commit: skip discarding the index if there is no pre-commit hook
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions