mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Documentation/merge-strategies: avoid hyphenated commands
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:
parent
7bbc4e8fdb
commit
3c3e6f5645
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue