diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-07-27 21:13:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-07-27 21:13:46 -0700 |
commit | a64fe6c1d5949492857e1a5ad14d60175dd484fa (patch) | |
tree | 7ead9fa752f3eba3caa799866f37e1a468d2a2bd /Documentation/howto/revert-a-faulty-merge.txt | |
parent | Merge branch 'jk/maint-checkout-orphan-check-fix' (diff) | |
parent | git-submodule: work with GIT_DIR/GIT_WORK_TREE (diff) | |
download | tgif-a64fe6c1d5949492857e1a5ad14d60175dd484fa.tar.xz |
Merge branch 'dg/submodule-in-dismembered-working-tree'
In a superproject that has repository outside of its working tree,
"git submodule add" failed to clone a new submodule, as GIT_DIR and
GIT_WORK_TREE environment variables necessary to work in such a
superproject interfered with access to the submodule repository.
* dg/submodule-in-dismembered-working-tree:
git-submodule: work with GIT_DIR/GIT_WORK_TREE
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions