diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-25 12:54:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-25 12:54:38 -0700 |
| commit | 3214e5f10c469804fcdd6096f3c3f32098ae9052 (patch) | |
| tree | e5d0d5a19675447f6eb86a18b524343a608e1db7 /git-pull.html | |
| parent | 7c59c67912d7b4c6aec60b899ba560b47de6a034 (diff) | |
| download | git-htmldocs-3214e5f10c469804fcdd6096f3c3f32098ae9052.tar.gz | |
Autogenerated HTML docs for v1.9.1-352-gd393d
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html index 35e51b558..7095e5c97 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1539,10 +1539,10 @@ refspecs, if you don’t provide one on the command line. <div class="sect1">
<h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
+<div class="paragraph"><p>The merge mechanism (<tt>git merge</tt> and <tt>git pull</tt> commands) allows the
backend <em>merge strategies</em> to be chosen with <tt>-s</tt> option. Some strategies
can also take their own options, which can be passed by giving <tt>-X<option></tt>
-arguments to <em>git-merge</em> and/or <em>git-pull</em>.</p></div>
+arguments to <tt>git merge</tt> and/or <tt>git pull</tt>.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
resolve
|