diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-02 00:45:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-02 00:52:59 -0800 |
| commit | 8273c79ae2e6b782dba3dccb815b386cc83e4294 (patch) | |
| tree | 7f115e4cf37acda3ef372cec38f1350300779dc5 /apply.c | |
| parent | 2beb3cdd18225be657849790ed845c4d367b760a (diff) | |
| download | git-8273c79ae2e6b782dba3dccb815b386cc83e4294.tar.gz git-8273c79ae2e6b782dba3dccb815b386cc83e4294.tar.xz | |
war on whitespaces: documentation.
We were missing the --whitespace option in the usage string for
git-apply and git-am, so this commit adds them.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'apply.c')
| -rw-r--r-- | apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -32,7 +32,7 @@ static int no_add = 0; static int show_index_info = 0; static int line_termination = '\n'; static const char apply_usage[] = -"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] <patch>..."; +"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>..."; static enum whitespace_eol { nowarn_whitespace, |