diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-03 14:14:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-03 14:14:01 -0700 |
| commit | 7662973ea38e39f2766a4403209189f263c914a3 (patch) | |
| tree | 38d64a67067ae465a32e50e3b998c7d84c29c2fc /t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master | |
| parent | Git 2.6-rc0 (diff) | |
| parent | rerere: release lockfile in non-writing functions (diff) | |
| download | tgif-7662973ea38e39f2766a4403209189f263c914a3.tar.xz | |
Merge branch 'jk/am-rerere-lock-fix'
Recent "git am" introduced a double-locking failure when used with
the "--3way" option that invokes rerere machinery.
* jk/am-rerere-lock-fix:
rerere: release lockfile in non-writing functions
Diffstat (limited to 't/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master')
0 files changed, 0 insertions, 0 deletions