From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Sun, 16 Mar 2014 22:54:56 +0000 (-0400)
Subject: Documentation/merge-strategies: avoid hyphenated commands
X-Git-Tag: v1.9.2~16^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c3e6f5645c5e661bc8c338e4e7a9252a14e429e;p=thirdparty%2Fgit.git

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>
---

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 49a9a7d53f..81e349309c 100644
--- 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