From c2d5036de5c2e21fb736002ae5b385ceb7c6b23b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 3 Oct 2005 22:28:45 -0700 Subject: git-apply: retire unused/unimplemented --no-merge flag. The original plan was to do 3-way merge between local working tree, index and the patch being applied, but that was never implemented. Retire the flag to control its behaviour. Signed-off-by: Junio C Hamano --- Documentation/git-apply.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Documentation/git-apply.txt') diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 4f7e1195de..cb676348f8 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -9,7 +9,7 @@ git-apply - Apply patch on a GIT index file and a work tree SYNOPSIS -------- -'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [...] +'git-apply' [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [...] DESCRIPTION ----------- @@ -22,11 +22,6 @@ OPTIONS The files to read patch from. '-' can be used to read from the standard input. ---no-merge:: - The default mode of operation is the merge behaviour - which is not implemented yet. This flag explicitly - tells the program not to use the merge behaviour. - --stat:: Instead of applying the patch, output diffstat for the input. Turns off "apply". -- cgit v1.2.3 From 98438bd0e893c23186fb82ea8b04964c0f1ef9d1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 10 Oct 2005 14:49:52 -0700 Subject: Remove the version tags from the manpages Signed-off-by: Christian Meder Signed-off-by: Junio C Hamano --- Documentation/git-apply.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'Documentation/git-apply.txt') diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index e095f93c08..5e157ac7cd 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -1,6 +1,5 @@ git-apply(1) ============ -v0.1, June 2005 NAME ---- -- cgit v1.2.3 From 72e9340cfde90189d76ef3c8a4793ea7764ff8ee Mon Sep 17 00:00:00 2001 From: Christian Meder Date: Mon, 10 Oct 2005 16:01:31 -0700 Subject: Convert usage of GIT and Git into git Convert usage of GIT and Git into git. Signed-off-by: Christian Meder Signed-off-by: Junio C Hamano --- Documentation/git-apply.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-apply.txt') diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 5e157ac7cd..61d9dacc6f 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -3,7 +3,7 @@ git-apply(1) NAME ---- -git-apply - Apply patch on a GIT index file and a work tree +git-apply - Apply patch on a git index file and a work tree SYNOPSIS -- cgit v1.2.3 From d88156e943ab4ab5990fb8929fc432f7638df7f6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 14 Oct 2005 21:56:46 -0700 Subject: Update documentation for C-style quoting. Signed-off-by: Junio C Hamano --- Documentation/git-apply.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'Documentation/git-apply.txt') diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 61d9dacc6f..e928088e44 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -8,7 +8,7 @@ git-apply - Apply patch on a git index file and a work tree SYNOPSIS -------- -'git-apply' [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [...] +'git-apply' [--stat] [--summary] [--check] [--index] [--apply] [--show-files] [--index-info] [-z] [...] DESCRIPTION ----------- @@ -48,6 +48,20 @@ OPTIONS --show-files:: Show summary of files that are affected by the patch. +--index-info:: + Newer git-diff output has embedded 'index information' + for each blob to help identify the original version that + the patch applies to. When this flag is given, and if + the original version of the blob is available locally, + outputs information about them to the standard output. + +-z:: + When showing the index information, do not munge paths, + but use NUL terminated machine readable format. Without + this flag, the pathnames output will have TAB, LF, and + backslash characters replaced with `\t`, `\n`, and `\\`, + respectively. + --apply:: If you use any of the options marked ``Turns off "apply"'' above, git-apply reads and outputs the -- cgit v1.2.3 From 58452f9442a1fa20e0fde5d200091b7f02e62cea Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 16 Oct 2005 22:06:16 -0700 Subject: git-apply: remove unused --show-files flag. Linus says he does not use it (and the thinking behind its initial introduction), and neither Cogito nor StGIT uses it. Signed-off-by: Junio C Hamano --- Documentation/git-apply.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Documentation/git-apply.txt') diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index e928088e44..fd38ee5b19 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -8,7 +8,7 @@ git-apply - Apply patch on a git index file and a work tree SYNOPSIS -------- -'git-apply' [--stat] [--summary] [--check] [--index] [--apply] [--show-files] [--index-info] [-z] [...] +'git-apply' [--stat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] [...] DESCRIPTION ----------- @@ -45,9 +45,6 @@ OPTIONS up-to-date, it is flagged as an error. This flag also causes the index file to be updated. ---show-files:: - Show summary of files that are affected by the patch. - --index-info:: Newer git-diff output has embedded 'index information' for each blob to help identify the original version that -- cgit v1.2.3 From 7d8b7c21c9c0bee0d94fcf3b350e24ebdb920b74 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 28 Oct 2005 02:43:31 -0700 Subject: git-apply --numstat The new option, --numstat, shows number of inserted and deleted lines for each path. It is similar to --stat output but is meant to be more machine friendly by giving number of added and deleted lines and unabbreviated paths. Signed-off-by: Junio C Hamano --- Documentation/git-apply.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Documentation/git-apply.txt') diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index fd38ee5b19..eb8f906837 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -8,7 +8,7 @@ git-apply - Apply patch on a git index file and a work tree SYNOPSIS -------- -'git-apply' [--stat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] [...] +'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] [...] DESCRIPTION ----------- @@ -25,6 +25,12 @@ OPTIONS Instead of applying the patch, output diffstat for the input. Turns off "apply". +--numstat:: + Similar to \--stat, but shows number of added and + deleted lines in decimal notation and pathname without + abbreviation, to make it more machine friendly. Turns + off "apply". + --summary:: Instead of applying the patch, output a condensed summary of information obtained from git diff extended -- cgit v1.2.3