Documentation/merge-strategies: avoid hyphenated commands
Replace git-pull and git-merge with the corresponding un-hyphenated versions. While at it, use ` to mark it up instead of '. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Mar 16, 2014 at 18:54 UTC
3c3e6f5645c5e661bc8c338e4e7a9252a14e429e
1 file changed
+2
-2
Documentation/merge-strategies.txt
+2
-2
@@ -1,10 +1,10 @@
1
MERGE STRATEGIES
2
----------------
3
4
-The merge mechanism ('git-merge' and 'git-pull' commands) allows the
4
+The merge mechanism (`git merge` and `git pull` commands) allows the
5
backend 'merge strategies' to be chosen with `-s` option. Some strategies
6
can also take their own options, which can be passed by giving `-X<option>`
7
-arguments to 'git-merge' and/or 'git-pull'.
7
+arguments to `git merge` and/or `git pull`.
8
9
resolve::
10
This can only resolve two heads (i.e. the current branch