diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-25 12:54:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-25 12:54:38 -0700 |
| commit | 3214e5f10c469804fcdd6096f3c3f32098ae9052 (patch) | |
| tree | e5d0d5a19675447f6eb86a18b524343a608e1db7 /merge-strategies.txt | |
| parent | 7c59c67912d7b4c6aec60b899ba560b47de6a034 (diff) | |
| download | git-htmldocs-3214e5f10c469804fcdd6096f3c3f32098ae9052.tar.gz | |
Autogenerated HTML docs for v1.9.1-352-gd393d
Diffstat (limited to 'merge-strategies.txt')
| -rw-r--r-- | merge-strategies.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-strategies.txt b/merge-strategies.txt index 350949810..7bbd19b30 100644 --- a/merge-strategies.txt +++ b/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 |