diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-28 06:24:11 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-28 06:24:11 +0300 |
| commit | 98cdf78c5cf1356757ccc4d25c212ae1f38339e4 (patch) | |
| tree | 8c9936b21070e664e36f2b5e61b96e371f1a50f6 /Documentation | |
| parent | 496db64202b11e66a080873ca9e32f1354dcfd3e (diff) | |
| parent | c6576f912fc34193a02d7ec587484f7c2ce3fe77 (diff) | |
Merge branch 'ta/quiet-pull'
* ta/quiet-pull:
Retain multiple -q/-v occurrences in git pull
Teach/Fix pull/fetch -q/-v options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 007909a82f..427cdefd01 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -1,3 +1,11 @@ +-q:: +--quiet:: + Operate quietly. + +-v:: +--verbose:: + Be verbose. + --stat:: Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat. |