summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 11:01:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 11:01:14 -0700
commita3f4eb1b40457d85ab63168b621e71eaf73bb3c4 (patch)
tree820a0708317f463df97523b117806be63cb1e709 /merge-recursive.c
parentMerge branch 'ee/clean-remove-dirs' (diff)
parentsetup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR (diff)
downloadtgif-a3f4eb1b40457d85ab63168b621e71eaf73bb3c4.tar.xz
Merge branch 'nd/export-worktree'
Running an aliased command from a subdirectory when the .git thing in the working tree is a gitfile pointing elsewhere did not work. * nd/export-worktree: setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions