development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

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

Browse source 
* rr/doc-merge-strategies:
  Documentation/merge-strategies: avoid hyphenated commands
This commit is contained in:
Junio C Hamano 2014-04-03 13:39:03 -07:00
parent 9c7d0cc62f 3c3e6f5645
commit 3824595664
1 changed files with 2 additions and 2 deletions
Show stats 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
----------------
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