summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-08-16 16:09:25 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-08-16 21:08:45 -0700
commit2cda1a214e9d2e362242027b4b622ecb3d9260de (patch)
treedbb12a6dc86bd5070772425c9b82cda32a87d8e9 /builtin-apply.c
parentdiff.c: make binary patch reversible. (diff)
downloadtgif-2cda1a214e9d2e362242027b4b622ecb3d9260de.tar.xz
apply --reverse: tie it all together.
Add a few tests, usage string, and documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index be6e94d367..4737b64c32 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -43,7 +43,7 @@ static int show_index_info;
static int line_termination = '\n';
static unsigned long p_context = -1;
static const char apply_usage[] =
-"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-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] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
static enum whitespace_eol {
nowarn_whitespace,