mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rr/doc-merge-strategies'

Browse Source 
* rr/doc-merge-strategies:
  Documentation/merge-strategies: avoid hyphenated commands
This commit is contained in:
Junio C Hamano
2014-03-25 11:08:23 -07:00
parent 0e8c09263e 3c3e6f5645
commit 3e33860aa1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/merge-strategies.txt
View File

@ -1,10 +1,10 @@
MERGE STRATEGIES 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 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>` 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:: resolve::
This can only resolve two heads (i.e. the current branch This can only resolve two heads (i.e. the current branch