]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16ffa64 9dd330e)
Merge branch 'jk/am-rerere-lock-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Sep 2015 21:14:01 +0000 (14:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Sep 2015 21:14:01 +0000 (14:14 -0700)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.