diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
| commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
| tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /merge-options.txt | |
| parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
| download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz | |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/merge-options.txt b/merge-options.txt index fec339430..3b83dba1a 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -59,8 +59,8 @@ option can be used to override --squash. Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies - is used instead ('git-merge-recursive' when merging a single - head, 'git-merge-octopus' otherwise). + is used instead ('git merge-recursive' when merging a single + head, 'git merge-octopus' otherwise). --summary:: --no-summary:: @@ -74,3 +74,8 @@ option can be used to override --squash. -v:: --verbose:: Be verbose. + +-X <option>:: +--strategy-option=<option>:: + Pass merge strategy specific option through to the merge + strategy. |