diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:03 -0700 |
| commit | 38245956648c54d138efc7b95b450dc7203e2a2f (patch) | |
| tree | 7cd5d4ef84f71587cc35f3dade01b1340eba9943 /Documentation | |
| parent | Merge branch 'jk/shallow-update-fix' into maint (diff) | |
| parent | Documentation/merge-strategies: avoid hyphenated commands (diff) | |
| download | tgif-38245956648c54d138efc7b95b450dc7203e2a2f.tar.xz | |
Merge branch 'rr/doc-merge-strategies' into maint
* rr/doc-merge-strategies:
Documentation/merge-strategies: avoid hyphenated commands
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-strategies.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index fb6e593e7c..feabc1ccf4 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -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 |