diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-10-22 04:12:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-10-22 04:12:17 +0000 |
| commit | d2179ef025405832dff42141faed13199886b61c (patch) | |
| tree | ffbde742771a380129d0223749ed086fbea39271 /merge-strategies.txt | |
| parent | 7f9fa86e7b663383dc905c5b41bedda5cedf02e6 (diff) | |
| download | git-htmldocs-d2179ef025405832dff42141faed13199886b61c.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-90-gd4c43
Diffstat (limited to 'merge-strategies.txt')
| -rw-r--r-- | merge-strategies.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-strategies.txt b/merge-strategies.txt index 049313d60..8676e26ca 100644 --- a/merge-strategies.txt +++ b/merge-strategies.txt @@ -52,7 +52,7 @@ no-renormalize;; Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable. -subtree[=path];; +subtree[=<path>];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging. Instead, the specified path |