diff options
| author | Štěpán Němec <stepan.nemec@gmail.com> | 2010-10-08 17:31:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-08 19:29:52 (GMT) |
| commit | 62b4698e551c29b3d2539a764ad0e93cfff53c03 (patch) | |
| tree | cd4af64ba97d77fda2ba86ac82bfb76bd09e0c58 /Documentation/merge-strategies.txt | |
| parent | 7c6eafa35af805578990e76b691ff7f1a25a3c57 (diff) | |
| download | git-62b4698e551c29b3d2539a764ad0e93cfff53c03.zip git-62b4698e551c29b3d2539a764ad0e93cfff53c03.tar.gz git-62b4698e551c29b3d2539a764ad0e93cfff53c03.tar.bz2 | |
Use angles for placeholders consistently
Signed-off-by: Štěpán Němec <stepnem@gmail.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
| -rw-r--r-- | Documentation/merge-strategies.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 049313d..8676e26 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/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 |