diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-02 06:40:50 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-02 06:40:50 +0400 |
| commit | e6c7c2cc9766434607b8da5db872e7881a043925 (patch) | |
| tree | ab967dcf2cedf2f9f63d54e12adc1ca046e4edc2 /Documentation | |
| parent | 4197195bee15f120e99d797b22108fd274235fd7 (diff) | |
| parent | fcdd0e92d9d42b8fa4569d92ba1013bb0eedfcd8 (diff) | |
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')
| -rw-r--r-- | Documentation/git-am.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-stash.txt | 15 |
3 files changed, 17 insertions, 8 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 6d92cbee64..32e689b2bf 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -13,7 +13,7 @@ SYNOPSIS [--3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] - [--reject] + [--reject] [-q | --quiet] [<mbox> | <Maildir>...] 'git am' (--skip | --resolved | --abort) @@ -39,6 +39,10 @@ OPTIONS --keep:: Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). +-q:: +--quiet:: + Be quiet. Only print error messages. + -u:: --utf8:: Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 26f3b7b2b0..db1b71d248 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. diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index a42d4c85bd..1c64a02fe5 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -9,10 +9,11 @@ SYNOPSIS -------- [verse] 'git stash' list [<options>] -'git stash' ( show | drop ) [<stash>] -'git stash' ( pop | apply ) [--index] [<stash>] +'git stash' show [<stash>] +'git stash' drop [-q|--quiet] [<stash>] +'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' branch <branchname> [<stash>] -'git stash' [save [--keep-index] [<message>]] +'git stash' [save [--keep-index] [-q|--quiet] [<message>]] 'git stash' clear 'git stash' create @@ -41,7 +42,7 @@ is also possible). OPTIONS ------- -save [--keep-index] [<message>]:: +save [--keep-index] [-q|--quiet] [<message>]:: Save your local modifications to a new 'stash', and run `git reset --hard` to revert them. This is the default action when no @@ -75,7 +76,7 @@ show [<stash>]:: it will accept any format known to 'git-diff' (e.g., `git stash show -p stash@\{1}` to view the second most recent stash in patch form). -pop [<stash>]:: +pop [--index] [-q|--quiet] [<stash>]:: Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse @@ -93,7 +94,7 @@ longer apply the changes as they were originally). + When no `<stash>` is given, `stash@\{0}` is assumed. -apply [--index] [<stash>]:: +apply [--index] [-q|--quiet] [<stash>]:: Like `pop`, but do not remove the state from the stash list. @@ -115,7 +116,7 @@ clear:: Remove all the stashed states. Note that those states will then be subject to pruning, and may be difficult or impossible to recover. -drop [<stash>]:: +drop [-q|--quiet] [<stash>]:: Remove a single stashed state from the stash list. When no `<stash>` is given, it removes the latest one. i.e. `stash@\{0}` |