Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'wt/doc-submodule-name-path-confusion-1'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Mar 2014 23:31:13 +0000
(16:31 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Mar 2014 23:31:14 +0000
(16:31 -0700)
* wt/doc-submodule-name-path-confusion-1:
doc: submodule.* config are keyed by submodule names
Documentation/git-submodule.txt
patch
|
blob
|
history
raw
(from parent 1:
8456113
)
diff --git
a/Documentation/git-submodule.txt
b/Documentation/git-submodule.txt
index 46c1eebb938dad182aeafafd9e680226c253dd65..a15d92d09bbd12aa553bbafa3d7f40e17504b09f 100644
(file)
--- a/
Documentation/git-submodule.txt
+++ b/
Documentation/git-submodule.txt
@@
-247,7
+247,7
@@
OPTIONS
-b::
--branch::
Branch of repository to add as submodule.
- The name of the branch is recorded as `submodule.<
path
>.branch` in
+ The name of the branch is recorded as `submodule.<
name
>.branch` in
`.gitmodules` for `update --remote`.
-f::