diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:21 -0700 |
| commit | dae477777e5d38780dabb0ebabbfd32fc89c10f6 (patch) | |
| tree | 9d445a8e480d1f058a5f75d93805bbc8c56d62bd /merge-recursive.c | |
| parent | 758d0773baa3732bc62838070566513df6a84239 (diff) | |
| parent | a9472afb6328e22cdaea4225d3b36b97d2e9e704 (diff) | |
| download | git-dae477777e5d38780dabb0ebabbfd32fc89c10f6.tar.gz | |
Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions