Merge branch 'jc/am-state-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2015 22:39:01 +0000 (15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2015 22:39:03 +0000 (15:39 -0700)
commitd75bb73...cf2ecce38c147980aac0cbc27a6b838a
tree915571f...95467d0a8b441455a94d6dca3c95f697copy hash to clipboard (tree)
parent2ba6183...0b809ff10ec212e1f7b4c9f72fc076aecopy hash to clipboard (diff)
parent1f76a10...2d72245332ac41bd79249cb82f3946f0copy hash to clipboard (diff)
builtin/am.c
builtin/worktree.c
cache.h
submodule.c