diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:28:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:28:44 -0700 |
| commit | 3bb6149186ea6bed5e6fd7b2f830fb499a1a8658 (patch) | |
| tree | 66ddba88750eec50e0418b55c3eb1450a3ed37da /Documentation | |
| parent | Merge branch 'jk/format-patch-from' (diff) | |
| parent | submodule update: allow custom command to update submodule working tree (diff) | |
| download | tgif-3bb6149186ea6bed5e6fd7b2f830fb499a1a8658.tar.xz | |
Merge branch 'cp/submodule-custom-update'
In addition to the choice from "rebase, merge, or checkout-detach",
allow a custom command to be used in "submodule update" to update
the working tree of submodules.
* cp/submodule-custom-update:
submodule update: allow custom command to update submodule working tree
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-submodule.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index bfff09062d..134282700c 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -159,7 +159,9 @@ update:: This will make the submodules HEAD be detached unless `--rebase` or `--merge` is specified or the key `submodule.$name.update` is set to `rebase`, `merge` or `none`. `none` can be overridden by specifying - `--checkout`. + `--checkout`. Setting the key `submodule.$name.update` to `!command` + will cause `command` to be run. `command` can be any arbitrary shell + command that takes a single argument, namely the sha1 to update to. + If the submodule is not yet initialized, and you just want to use the setting as stored in .gitmodules, you can automatically initialize the |