diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-03-15 20:32:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-03-15 20:32:55 +0000 |
| commit | ea90ab36bcffba684cc88930450530c859318536 (patch) | |
| tree | 6da3447e8586e094473ade4edd6370a94270be92 /merge-options.txt | |
| parent | caa712abb1d806cccb0f24a300e299da1777fc7d (diff) | |
| download | git-htmldocs-ea90ab36bcffba684cc88930450530c859318536.tar.gz | |
Autogenerated HTML docs for v1.7.0.2-273-gc2413
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index 3b83dba1a..37ce9a17f 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -67,6 +67,7 @@ option can be used to override --squash. Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future. +ifndef::git-pull[] -q:: --quiet:: Operate quietly. @@ -74,6 +75,7 @@ option can be used to override --squash. -v:: --verbose:: Be verbose. +endif::git-pull[] -X <option>:: --strategy-option=<option>:: |