Merge branch 'rr/doc-merge-strategies' into maint

* rr/doc-merge-strategies: Documentation/merge-strategies: avoid hyphenated commands
git-mirror · Apr 3, 2014 · 3824595 · 3824595
2 parents 9c7d0cc + 3c3e6f5
commit 3824595
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
@@ -1,10 +1,10 @@
 MERGE STRATEGIES
 ----------------
 
-The merge mechanism ('git-merge' and 'git-pull' commands) allows the
+The merge mechanism (`git merge` and `git pull` commands) allows the
 backend 'merge strategies' to be chosen with `-s` option.  Some strategies
 can also take their own options, which can be passed by giving `-X<option>`
-arguments to 'git-merge' and/or 'git-pull'.
+arguments to `git merge` and/or `git pull`.
 
 resolve::
 	This can only resolve two heads (i.e. the current branch