summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-12 15:16:53 -0800
committerJunio C Hamano <gitster@pobox.com>2016-01-12 15:16:53 -0800
commitd82d093456284e1a60db6c91f01a99b47880277f (patch)
tree13d6bb68cd2c2985b1aeb099cb8d393f72f0aabc /fmt-merge-msg.h
parent754884255bb580df159e58defa81cdd30b5c430c (diff)
parentdf1e6ea87a58fc8d029efb3041d851f7d6653a1d (diff)
downloadgit-d82d093456284e1a60db6c91f01a99b47880277f.tar.gz
Merge branch 'nd/stop-setenv-work-tree'
An earlier change in 2.5.x-era broke users' hooks and aliases by exporting GIT_WORK_TREE to point at the root of the working tree, interfering when they tried to use a different working tree without setting GIT_WORK_TREE environment themselves. * nd/stop-setenv-work-tree: Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions