"W. Trevor King" writes:
> As an example to make this clearer:
>
> $ cat .gitmodules
> [submodule "sub1"]
> path = sub1
> url = git://example.com/sub1.git
> remote = remote1
> branch = branch1
> update-source = submodule-upstream
> update = rebase
> [submodule "sub2"
As an example to make this clearer:
$ cat .gitmodules
[submodule "sub1"]
path = sub1
url = git://example.com/sub1.git
remote = remote1
branch = branch1
update-source = submodule-upstream
update = rebase
[submodule "sub2"]
...
Means that `git submodule update sub1`
On Mon, Dec 03, 2012 at 08:46:46AM -0800, Junio C Hamano wrote:
> As you hinted in the first paragraph, you could flip between merge,
> rebase, and detach with a command line option when running the
> "update" subcommand, but I would imagine that the expected use
> pattern is that for a particular
"W. Trevor King" writes:
> From: "W. Trevor King"
>
> The current `update` command incorporates the superproject's gitlinked
> SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the
> options you use, it may checkout $sha1, rebase the $subsha1 onto
> $sha1, or merge $sha1 into $subs
From: "W. Trevor King"
The current `update` command incorporates the superproject's gitlinked
SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the
options you use, it may checkout $sha1, rebase the $subsha1 onto
$sha1, or merge $sha1 into $subsha1. This helps you keep up with
chan
5 matches
Mail list logo
