diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-16 02:54:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-16 02:54:18 -0700 |
| commit | 402fa75eed29c104ae5392ce88560f6bffc64ce7 (patch) | |
| tree | 3a11126c271f412b35b8a0409ce104bce678fae1 /Documentation/git-apply.txt | |
| parent | git-rm: Trivial fix for a comment typo. (diff) | |
| parent | Have sample update hook not refuse deleting a branch through push. (diff) | |
| download | tgif-402fa75eed29c104ae5392ce88560f6bffc64ce7.tar.xz | |
Merge branch 'maint'
* maint:
Have sample update hook not refuse deleting a branch through push.
variable $projectdesc needs to be set before checking against unchanged default.
Update git-annotate/git-blame documentation
Update git-apply documentation
Update git-applymbox documentation
Update git-am documentation
user-manual: use detached head when rewriting history
user-manual: start revising "internals" chapter
user-manual: detached HEAD
user-manual: fix discussion of default clone
Documentation: clarify track/no-track option.
Documentation: clarify git-checkout -f, minor editing
Documentation: minor edits of git-lost-found manpage
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 065ba1bf24..3bd2c995da 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -9,11 +9,12 @@ git-apply - Apply a patch on a git index file and a working tree SYNOPSIS -------- [verse] -'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] - [--no-add] [--index-info] [--allow-binary-replacement | --binary] - [-R | --reverse] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] - [--whitespace=<nowarn|warn|error|error-all|strip>] [--exclude=PATH] - [--cached] [--verbose] [<patch>...] +'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] + [--apply] [--no-add] [--index-info] [-R | --reverse] + [--allow-binary-replacement | --binary] [--reject] [-z] + [-pNUM] [-CNUM] [--inaccurate-eof] [--cached] + [--whitespace=<nowarn|warn|error|error-all|strip>] + [--exclude=PATH] [--verbose] [<patch>...] DESCRIPTION ----------- @@ -158,7 +159,7 @@ discouraged. correctly. This option adds support for applying such patches by working around this bug. ---verbose:: +-v, --verbose:: Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported. |