diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-05 14:35:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-05 14:35:00 -0800 |
| commit | ff5134b2fffe202fb48498f15d6e47673f9bd6b2 (patch) | |
| tree | 4b9eed59b70cfbe4b66281ecb25e4f26997df4fc /git-merge-one-file.sh | |
| parent | Merge branch 'es/fetch-show-failed-submodules-atend' (diff) | |
| parent | submodule.c: use get_git_dir() instead of get_git_common_dir() (diff) | |
| download | tgif-ff5134b2fffe202fb48498f15d6e47673f9bd6b2.tar.xz | |
Merge branch 'pb/recurse-submodule-in-worktree-fix'
The "--recurse-submodules" option of various subcommands did not
work well when run in an alternate worktree, which has been
corrected.
* pb/recurse-submodule-in-worktree-fix:
submodule.c: use get_git_dir() instead of get_git_common_dir()
t2405: clarify test descriptions and simplify test
t2405: use git -C and test_commit -C instead of subshells
t7410: rename to t2405-worktree-submodule.sh
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions