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/merge-strategies.txt | |
| 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/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions