diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-02 02:40:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-02 02:40:50 (GMT) |
| commit | e6c7c2cc9766434607b8da5db872e7881a043925 (patch) | |
| tree | ab967dcf2cedf2f9f63d54e12adc1ca046e4edc2 /Documentation/git-rebase.txt | |
| parent | 4197195bee15f120e99d797b22108fd274235fd7 (diff) | |
| parent | fcdd0e92d9d42b8fa4569d92ba1013bb0eedfcd8 (diff) | |
| download | git-e6c7c2cc9766434607b8da5db872e7881a043925.zip git-e6c7c2cc9766434607b8da5db872e7881a043925.tar.gz git-e6c7c2cc9766434607b8da5db872e7881a043925.tar.bz2 | |
Merge branch 'sb/quiet-porcelains'
* sb/quiet-porcelains:
stash: teach quiet option
am, rebase: teach quiet option
submodule, repack: migrate to git-sh-setup's say()
git-sh-setup: introduce say() for quiet options
am: suppress apply errors when using 3-way
t4150: test applying with a newline in subject
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 26f3b7b..db1b71d 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -236,6 +236,10 @@ OPTIONS is used instead ('git-merge-recursive' when merging a single head, 'git-merge-octopus' otherwise). This implies --merge. +-q:: +--quiet:: + Be quiet. Implies --no-stat. + -v:: --verbose:: Be verbose. Implies --stat. |