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 /git-pull.txt | |
| parent | caa712abb1d806cccb0f24a300e299da1777fc7d (diff) | |
| download | git-htmldocs-ea90ab36bcffba684cc88930450530c859318536.tar.gz | |
Autogenerated HTML docs for v1.7.0.2-273-gc2413
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-pull.txt b/git-pull.txt index 31f42ea21..ab4de1035 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -31,6 +31,16 @@ in a state that is hard to back out of in the case of a conflict. OPTIONS ------- +-q:: +--quiet:: + This is passed to both underlying git-fetch to squelch reporting of + during transfer, and underlying git-merge to squelch output during + merging. + +-v:: +--verbose:: + Pass --verbose to git-fetch and git-merge. + Options related to merging ~~~~~~~~~~~~~~~~~~~~~~~~~~ |