From 06ada1529ce46e84aaef4e5608c1101c1c7ec73f Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 9 Oct 2007 23:00:03 +0200 Subject: Fix some typos, punctuation, missing words, minor markup. Signed-off-by: Lars Hjemli Signed-off-by: Shawn O. Pearce --- Documentation/git-diff.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index db2eb46a19..ce0f502468 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -125,7 +125,7 @@ $ git diff topic...master <3> + <1> Changes between the tips of the topic and the master branches. <2> Same as above. -<3> Changes that occured on the master branch since when the topic +<3> Changes that occurred on the master branch since when the topic branch was started off it. Limiting the diff output:: -- cgit v1.2.3 From 9e6c723087def70d001740db48cf042b77a1d9cd Mon Sep 17 00:00:00 2001 From: Gerrit Pape Date: Wed, 31 Oct 2007 13:59:16 +0000 Subject: git-diff.txt: add section "output format" describing the diff formats git-diff.txt includes diff-options.txt which for the -p option refers to a section "generating patches.." which is missing from the git-diff documentation. This patch adapts diff-format.txt to additionally mention the git-diff program, and includes diff-format.txt into git-diff.txt. Tino Keitel noticed this problem. Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index db2eb46a19..201d5daf1a 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -82,6 +82,9 @@ include::diff-options.txt[] the diff to the named paths (you can give directory names and get diff for all files under them). +Output format +------------- +include::diff-format.txt[] EXAMPLES -------- -- cgit v1.2.3 From c1a95fa629b837fd291ca0e1428604710a2bc1dd Mon Sep 17 00:00:00 2001 From: Sergei Organov Date: Thu, 15 Nov 2007 16:19:29 +0300 Subject: Documentation: customize diff-options depending on particular command Customize diff-options depending on particular command as follows, mostly to make git-diff and git-format-patch manuals less confusing: * git-format-patch: - Mark --patch-with-stat as being the default. - Change -p description so that it matches what it actually does and so that it doesn't refer to absent "section on generating patches". * git-diff: mark -p as being the default. * git-diff-index/git-diff-files/git-diff-tree: mark --raw as being the default. Signed-off-by: Sergei Organov Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 11c4216c4a..2808a5ec44 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -75,6 +75,7 @@ and the range notations (".." and OPTIONS ------- +:git-diff: 1 include::diff-options.txt[] ...:: -- cgit v1.2.3 From 5162e69732d13dd079919a389a6ace8878aad716 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 29 Dec 2007 00:20:38 -0600 Subject: Documentation: rename gitlink macro to linkgit Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P\w(\w|-)*?):(?P\S*?)(\[(?P.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P(http|https|ftp|file|mailto|callto|image|link)):(?P\S*?)(\[(?P.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 2808a5ec44..57c28628bb 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -21,7 +21,7 @@ tree and the index file, or the index file and the working tree. the index (staging area for the next commit). In other words, the differences are what you _could_ tell git to further add to the index but you still haven't. You can - stage these changes by using gitlink:git-add[1]. + stage these changes by using linkgit:git-add[1]. + If exactly two paths are given, and at least one is untracked, compare the two files / directories. This behavior can be @@ -67,11 +67,11 @@ for the last two forms that use ".." notations, can be any . For a more complete list of ways to spell , see -"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. +"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1]. However, "diff" is about comparing two _endpoints_, not ranges, and the range notations (".." and "\...") do not mean a range as defined in the -"SPECIFYING RANGES" section in gitlink:git-rev-parse[1]. +"SPECIFYING RANGES" section in linkgit:git-rev-parse[1]. OPTIONS ------- @@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the gitlink:git[7] suite +Part of the linkgit:git[7] suite -- cgit v1.2.3 From 9e1f0a85c68323830ea117092c55192b17aa3ac8 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 6 Jun 2008 09:07:32 +0200 Subject: documentation: move git(7) to git(1) As the "git" man page describes the "git" command at the end-user level, it seems better to move it to man section 1. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 57c28628bb..7acd428964 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite -- cgit v1.2.3 From b1889c36d85514e5e70462294c561a02c2edfe2b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 30 Jun 2008 01:09:04 -0500 Subject: Documentation: be consistent about "git-" versus "git " Since the git-* commands are not installed in $(bindir), using "git-command " in examples in the documentation is not a good idea. On the other hand, it is nice to be able to refer to each command using one hyphenated word. (There is no escaping it, anyway: man page names cannot have spaces in them.) This patch retains the dash in naming an operation, command, program, process, or action. Complete command lines that can be entered at a shell (i.e., without options omitted) are made to use the dashless form. The changes consist only of replacing some spaces with hyphens and vice versa. After a "s/ /-/g", the unpatched and patched versions are identical. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 7acd428964..c53eba557d 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -8,14 +8,14 @@ git-diff - Show changes between commits, commit and working tree, etc SYNOPSIS -------- -'git-diff' [] {0,2} [--] [...] +'git diff' [] {0,2} [--] [...] DESCRIPTION ----------- Show changes between two trees, a tree and the working tree, a tree and the index file, or the index file and the working tree. -'git-diff' [--options] [--] [...]:: +'git diff' [--options] [--] [...]:: This form is to view the changes you made relative to the index (staging area for the next commit). In other @@ -27,14 +27,14 @@ If exactly two paths are given, and at least one is untracked, compare the two files / directories. This behavior can be forced by --no-index. -'git-diff' [--options] --cached [] [--] [...]:: +'git diff' [--options] --cached [] [--] [...]:: This form is to view the changes you staged for the next commit relative to the named . Typically you would want comparison with the latest commit, so if you do not give , it defaults to HEAD. -'git-diff' [--options] [--] [...]:: +'git diff' [--options] [--] [...]:: This form is to view the changes you have in your working tree relative to the named . You can @@ -42,23 +42,23 @@ forced by --no-index. branch name to compare with the tip of a different branch. -'git-diff' [--options] [--] [...]:: +'git diff' [--options] [--] [...]:: This is to view the changes between two arbitrary . -'git-diff' [--options] .. [--] [...]:: +'git diff' [--options] .. [--] [...]:: This is synonymous to the previous form. If on one side is omitted, it will have the same effect as using HEAD instead. -'git-diff' [--options] \... [--] [...]:: +'git diff' [--options] \... [--] [...]:: This form is to view the changes on the branch containing and up to the second , starting at a common ancestor - of both . "git-diff A\...B" is equivalent to - "git-diff $(git-merge-base A B) B". You can omit any one + of both . "git diff A\...B" is equivalent to + "git diff $(git-merge-base A B) B". You can omit any one of , which has the same effect as using HEAD instead. Just in case if you are doing something exotic, it should be -- cgit v1.2.3 From 2baf1850ceb01dfbee862e30f2a69cf6064e13eb Mon Sep 17 00:00:00 2001 From: David Symonds Date: Wed, 29 Oct 2008 09:15:36 -0700 Subject: git-diff: Add --staged as a synonym for --cached. Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index c53eba557d..a2f192fb75 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -33,6 +33,7 @@ forced by --no-index. commit relative to the named . Typically you would want comparison with the latest commit, so if you do not give , it defaults to HEAD. + --staged is a synonym of --cached. 'git diff' [--options] [--] [...]:: -- cgit v1.2.3