development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation/merge-strategies: avoid hyphenated commands

Browse source 
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>
This commit is contained in:
Ramkumar Ramachandra 2014-03-16 18:54:56 -04:00 committed by Junio C Hamano
parent 7bbc4e8fdb
commit 3c3e6f5645
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