Merge branch 'ma/lockfile-fixes'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Nov 2017 04:11:21 +0000 (13:11 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Nov 2017 04:11:21 +0000 (13:11 +0900)
commit0b646bc...c96a57e345887e607e0b8c9a64ff262a
tree4c4e0e2...d1743413c7fa0e1172ccebb7cbc37191copy hash to clipboard (tree)
parentcb5918a...0d50f50e83787f65c2ddc3dcb10159fecopy hash to clipboard (diff)
parentb74c90f...419b002c664b0236f2941c34786b18b9copy hash to clipboard (diff)
builtin/checkout.c
builtin/commit.c
builtin/diff.c
cache-tree.c
cache.h
config.c
sequencer.c
sha1_file.c
wt-status.c