diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-11-28 06:27:13 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-11-28 06:27:13 +0000 |
| commit | 610d17623aa8b12cfd1e47396a4e99bf1d2aaceb (patch) | |
| tree | 6c60b44a29d0db9c79189e7b327c68ec23bc4ffb /merge-options.txt | |
| parent | 4653c6f23a5d055f0992a83ee2b00cec3e0652b7 (diff) | |
| download | git-htmldocs-610d17623aa8b12cfd1e47396a4e99bf1d2aaceb.tar.gz | |
Autogenerated HTML docs for v1.6.0.4-836-gd5cb
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index 007909a82..427cdefd0 100644 --- a/merge-options.txt +++ b/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. |