summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-25 18:08:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-25 18:08:23 (GMT)
commit3e33860aa1c39429ebfe2542adf9011bd2c9aeba (patch)
treeeac628f0199b0cf69f804bf74729ebce129da1a9 /Documentation/merge-strategies.txt
parent0e8c09263e87c548de006cdb6af035d42f845087 (diff)
parent3c3e6f5645c5e661bc8c338e4e7a9252a14e429e (diff)
downloadgit-3e33860aa1c39429ebfe2542adf9011bd2c9aeba.zip
git-3e33860aa1c39429ebfe2542adf9011bd2c9aeba.tar.gz
git-3e33860aa1c39429ebfe2542adf9011bd2c9aeba.tar.bz2
Merge branch 'rr/doc-merge-strategies'
* rr/doc-merge-strategies: Documentation/merge-strategies: avoid hyphenated commands
Diffstat (limited to 'Documentation/merge-strategies.txt')
-rw-r--r--Documentation/merge-strategies.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 3509498..7bbd19b 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