diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-04-14 14:07:36 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-04-14 14:07:36 +0000 |
| commit | b04bb3fbb5c8461cde3fdfe283963c01fc97b518 (patch) | |
| tree | 9c8289642a72748e3c12d13beecd35716b3c87b9 /merge-options.txt | |
| parent | 0e8c0b027943f592a2cc9d3752b32aba046a9f19 (diff) | |
| download | git-htmldocs-b04bb3fbb5c8461cde3fdfe283963c01fc97b518.tar.gz | |
Autogenerated HTML docs for v1.7.1-rc1-12-ga601
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/merge-options.txt b/merge-options.txt index 37ce9a17f..722d704ff 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -62,6 +62,11 @@ option can be used to override --squash. is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise). +-X <option>:: +--strategy-option=<option>:: + Pass merge strategy specific option through to the merge + strategy. + --summary:: --no-summary:: Synonyms to --stat and --no-stat; these are deprecated and will be @@ -76,8 +81,3 @@ ifndef::git-pull[] --verbose:: Be verbose. endif::git-pull[] - --X <option>:: ---strategy-option=<option>:: - Pass merge strategy specific option through to the merge - strategy. |