summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-25 14:00:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-25 14:00:44 -0700
commitfb3b7b1f95ce3c39f1116ebabf0bbcbfd3bb8796 (patch)
treea56b7339ad8c0877ee6d6fae25dba8caf58c8518 /merge-blobs.h
parentMerge branch 'jc/push-follow-tag' (diff)
parentsetup: suppress implicit "." work-tree for bare repos (diff)
downloadtgif-fb3b7b1f95ce3c39f1116ebabf0bbcbfd3bb8796.tar.xz
Merge branch 'jk/alias-in-bare'
An aliased command spawned from a bare repository that does not say it is bare with "core.bare = yes" is treated as non-bare by mistake. * jk/alias-in-bare: setup: suppress implicit "." work-tree for bare repos environment: add GIT_PREFIX to local_repo_env cache.h: drop LOCAL_REPO_ENV_SIZE
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions