diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:13 -0700 |
| commit | f4af7f19639457d71c4e9b53892b937468824cac (patch) | |
| tree | 7da4b356951fc0be359dc145939878e941794c6f /Documentation/merge-options.txt | |
| parent | 2a764974271aa36101b241fef8e2945db9b418a5 (diff) | |
| parent | f22a17e8da25a043950a13f11035930922bb86e7 (diff) | |
| download | git-f4af7f19639457d71c4e9b53892b937468824cac.tar.gz | |
Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint
* jl/submodule-add-relurl-wo-upstream:
submodule add: clean up duplicated code
submodule add: allow relative repository path even when no url is set
submodule add: test failure when url is not configured in superproject
Conflicts:
git-submodule.sh
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions