From: Junio C Hamano Date: Fri, 19 Sep 2008 06:27:02 +0000 (+0000) Subject: Autogenerated HTML docs for v1.6.0.2-287-g3791f X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2;p=git.git Autogenerated HTML docs for v1.6.0.2-287-g3791f --- diff --git a/config.txt b/config.txt index 922ac7b44..bea867df6 100644 --- a/config.txt +++ b/config.txt @@ -585,6 +585,22 @@ diff.external:: you want to use an external diff program only on a subset of your files, you might want to use linkgit:gitattributes[5] instead. +diff.mnemonicprefix:: + If set, 'git-diff' uses a prefix pair that is different from the + standard "a/" and "b/" depending on what is being compared. When + this configuration is in effect, reverse diff output also swaps + the order of the prefixes: +'git-diff';; + compares the (i)ndex and the (w)ork tree; +'git-diff HEAD';; + compares a (c)ommit and the (w)ork tree; +'git diff --cached';; + compares a (c)ommit and the (i)ndex; +'git-diff HEAD:file1 file2';; + compares an (o)bject and a (w)ork tree entity; +'git diff --no-index a b';; + compares two non-git things (1) and (2). + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the 'git-diff' option '-l'. diff --git a/git-config.html b/git-config.html index a64b28ddf..9c805844c 100644 --- a/git-config.html +++ b/git-config.html @@ -1576,6 +1576,59 @@ diff.external

+diff.mnemonicprefix +
+
+

+ If set, git-diff uses a prefix pair that is different from the + standard "a/" and "b/" depending on what is being compared. When + this configuration is in effect, reverse diff output also swaps + the order of the prefixes: +

+
+
+git-diff +
+
+

+ compares the (i)ndex and the (w)ork tree; +

+
+
+git-diff HEAD +
+
+

+ compares a (c)ommit and the (w)ork tree; +

+
+
+git diff --cached +
+
+

+ compares a (c)ommit and the (i)ndex; +

+
+
+git-diff HEAD:file1 file2 +
+
+

+ compares an (o)bject and a (w)ork tree entity; +

+
+
+git diff --no-index a b +
+
+

+ compares two non-git things (1) and (2). +

+
+
+
+
diff.renameLimit
@@ -2744,7 +2797,7 @@ web.browser diff --git a/git-diff-tree.html b/git-diff-tree.html index 5aeaa0218..607036747 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1248,6 +1248,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%d: ref names, like the --decorate option of git-log(1) +

    +
    • +
  • +

    %e: encoding

    • @@ -1568,7 +1573,7 @@ It is preceded with a "git diff" header, that looks like

    The a/ and b/ filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, -/dev/null is not used in place of a/ or b/ filenames.

    +/dev/null is _not_ used in place of a/ or b/ filenames.

    When rename/copy is involved, file1 and file2 show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively.

    @@ -1722,9 +1727,9 @@ and fileN does not have that line (in other words, the line was added, from the point of view of that parent).

    In the above example output, the function signature was changed from both files (hence two - removals from both file1 and -file2, plus + to mean one line that was added does not appear +file2, plus ++ to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same -from file1 but do not appear in file2 (hence prefixed with ).

    +from file1 but do not appear in file2 (hence prefixed with +).

    When shown by git diff-tree -c, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by git diff-files -c, it compares the @@ -1861,7 +1866,7 @@ the pathname, but if that is NUL, the record will show two paths.

    diff --git a/git-for-each-ref.html b/git-for-each-ref.html index c6c5afe13..8e026daf3 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -421,6 +421,7 @@ refname

    The name of the ref (the part after $GIT_DIR/). + For a non-ambiguous short name of the ref append :short.

    @@ -553,7 +554,7 @@ eval "$eval" diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index ebd7c5fbb..5061d3e4e 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt @@ -74,6 +74,7 @@ For all objects, the following names can be used: refname:: The name of the ref (the part after $GIT_DIR/). + For a non-ambiguous short name of the ref append `:short`. objecttype:: The type of the object (`blob`, `tree`, `commit`, `tag`). diff --git a/git-log.html b/git-log.html index 516a927e9..5865f202f 100644 --- a/git-log.html +++ b/git-log.html @@ -1822,6 +1822,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%d: ref names, like the --decorate option of git-log(1) +

    +
    • +
  • +

    %e: encoding

    • @@ -1920,7 +1925,7 @@ It is preceded with a "git diff" header, that looks like

    The a/ and b/ filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, -/dev/null is not used in place of a/ or b/ filenames.

    +/dev/null is _not_ used in place of a/ or b/ filenames.

    When rename/copy is involved, file1 and file2 show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively.

    @@ -2074,9 +2079,9 @@ and fileN does not have that line (in other words, the line was added, from the point of view of that parent).

    In the above example output, the function signature was changed from both files (hence two - removals from both file1 and -file2, plus + to mean one line that was added does not appear +file2, plus ++ to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same -from file1 but do not appear in file2 (hence prefixed with ).

    +from file1 but do not appear in file2 (hence prefixed with +).

    When shown by git diff-tree -c, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by git diff-files -c, it compares the @@ -2225,7 +2230,7 @@ reversible operation.

    diff --git a/git-rev-list.html b/git-rev-list.html index 2b8c52b78..769307485 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1410,6 +1410,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%d: ref names, like the --decorate option of git-log(1) +

    +
    • +
  • +

    %e: encoding

    • @@ -1501,7 +1506,7 @@ and the git-list <git@vger.kernel.org>.

    diff --git a/git-show.html b/git-show.html index df3f16d60..f6132e370 100644 --- a/git-show.html +++ b/git-show.html @@ -642,6 +642,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%d: ref names, like the --decorate option of git-log(1) +

    +
    • +
  • +

    %e: encoding

    • @@ -850,7 +855,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    diff --git a/git-whatchanged.html b/git-whatchanged.html index 30270517f..72346acb5 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -674,6 +674,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%d: ref names, like the --decorate option of git-log(1) +

    +
    • +
  • +

    %e: encoding

    • @@ -789,7 +794,7 @@ Junio C Hamano <gitster@pobox.com>

    diff --git a/gitattributes.html b/gitattributes.html index 30d3c5d67..450859849 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -595,26 +595,26 @@ with the above configuration, i.e. j-c-diff, with 7 parameters, just like GIT_EXTERNAL_DIFF program is called. See git(1) for details.

    Defining a custom hunk-header

    -

    Each group of changes (called "hunk") in the textual diff output +

    Each group of changes (called a "hunk") in the textual diff output is prefixed with a line of the form:

    @@ -k,l +n,m @@ TEXT
    -

    The text is called hunk header, and by default a line that -begins with an alphabet, an underscore or a dollar sign is used, -which matches what GNU diff -p output uses. This default -selection however is not suited for some contents, and you can -use customized pattern to make a selection.

    -

    First in .gitattributes, you would assign the diff attribute +

    This is called a hunk header. The "TEXT" portion is by default a line +that begins with an alphabet, an underscore or a dollar sign; this +matches what GNU diff -p output uses. This default selection however +is not suited for some contents, and you can use a customized pattern +to make a selection.

    +

    First, in .gitattributes, you would assign the diff attribute for paths.

    *.tex   diff=tex
    -

    Then, you would define "diff.tex.funcname" configuration to +

    Then, you would define a "diff.tex.funcname" configuration to specify a regular expression that matches a line that you would -want to appear as the hunk header, like this:

    +want to appear as the hunk header "TEXT", like this:

    [diff "tex"]
@@ -943,7 +943,7 @@ frotz   unspecified
    diff --git a/gitattributes.txt b/gitattributes.txt index 6f3551dc8..e848c9439 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -270,27 +270,27 @@ See linkgit:git[1] for details. Defining a custom hunk-header ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Each group of changes (called "hunk") in the textual diff output +Each group of changes (called a "hunk") in the textual diff output is prefixed with a line of the form: @@ -k,l +n,m @@ TEXT -The text is called 'hunk header', and by default a line that -begins with an alphabet, an underscore or a dollar sign is used, -which matches what GNU 'diff -p' output uses. This default -selection however is not suited for some contents, and you can -use customized pattern to make a selection. +This is called a 'hunk header'. The "TEXT" portion is by default a line +that begins with an alphabet, an underscore or a dollar sign; this +matches what GNU 'diff -p' output uses. This default selection however +is not suited for some contents, and you can use a customized pattern +to make a selection. -First in .gitattributes, you would assign the `diff` attribute +First, in .gitattributes, you would assign the `diff` attribute for paths. ------------------------ *.tex diff=tex ------------------------ -Then, you would define "diff.tex.funcname" configuration to +Then, you would define a "diff.tex.funcname" configuration to specify a regular expression that matches a line that you would -want to appear as the hunk header, like this: +want to appear as the hunk header "TEXT", like this: ------------------------ [diff "tex"] diff --git a/pretty-formats.txt b/pretty-formats.txt index 388d4925e..f18d33e00 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt @@ -116,6 +116,7 @@ The placeholders are: - '%cr': committer date, relative - '%ct': committer date, UNIX timestamp - '%ci': committer date, ISO 8601 format +- '%d': ref names, like the --decorate option of linkgit:git-log[1] - '%e': encoding - '%s': subject - '%b': body