diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-24 11:57:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-24 16:47:08 -0800 |
| commit | 91af7ae54f2a0af453c3a5ac612ed613b38b4fdf (patch) | |
| tree | ad10da40ea50dcc0599cd23fba5a43c59ef2d0bf /builtin-apply.c | |
| parent | d5a4164140c52a2d267d90e2413d1fe4a326a386 (diff) | |
| download | git-91af7ae54f2a0af453c3a5ac612ed613b38b4fdf.tar.gz git-91af7ae54f2a0af453c3a5ac612ed613b38b4fdf.tar.xz | |
core.whitespace: documentation updates.
This adds description of core.whitespace to the manual page of git-config,
and updates the stale description of whitespace handling in the manual
page of git-apply.
Also demote "strip" to a synonym status for "fix" as the value of --whitespace
option given to git-apply.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index e04b49388..57efcd5aa 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -45,7 +45,7 @@ static const char *fake_ancestor; static int line_termination = '\n'; static unsigned long p_context = ULONG_MAX; static const char apply_usage[] = -"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>..."; +"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|fix|error|error-all>] <patch>..."; static enum ws_error_action { nowarn_ws_error, |