summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-04-19 21:37:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-19 21:37:20 -0700
commiteb3af74e93953df7917dca43d264ac8d1fb85671 (patch)
tree11c6b0ae899ca4c5994e1b6d04f9bd9e4c01f251 /builtin/fmt-merge-msg.c
parentMerge branch 'nd/files-backend-git-dir' (diff)
parenttest-read-cache: setup git dir (diff)
downloadtgif-eb3af74e93953df7917dca43d264ac8d1fb85671.tar.xz
Merge branch 'jk/no-looking-at-dotgit-outside-repo'
Clean up fallouts from recent tightening of the set-up sequence, where Git barfs when repository information is accessed without first ensuring that it was started in a repository. * jk/no-looking-at-dotgit-outside-repo: test-read-cache: setup git dir has_sha1_file: don't bother if we are not in a repository
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions