diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:51:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:51:13 -0700 |
| commit | a49eb197d809d2d7efbd81d935c61e1a0caa983e (patch) | |
| tree | 06512c227fba59faaee57dcfe1ba71f049c4d0a7 /t/t9117-git-svn-init-clone.sh | |
| parent | Merge branch 'jc/cache-tree' (diff) | |
| parent | git-submodule: add support for --merge. (diff) | |
| download | tgif-a49eb197d809d2d7efbd81d935c61e1a0caa983e.tar.xz | |
Merge branch 'ph/submodule-rebase'
* ph/submodule-rebase:
git-submodule: add support for --merge.
Conflicts:
Documentation/git-submodule.txt
git-submodule.sh
Diffstat (limited to 't/t9117-git-svn-init-clone.sh')
0 files changed, 0 insertions, 0 deletions