From: Junio C Hamano Date: Thu, 24 Jul 2008 04:03:33 +0000 (+0000) Subject: Autogenerated HTML docs for v1.6.0-rc0-42-g186458 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ccc2f7606414a57fc7f34d2f88f8fb2246918d6d;p=git.git Autogenerated HTML docs for v1.6.0-rc0-42-g186458 --- diff --git a/git-diff-tree.html b/git-diff-tree.html index 3f9519e74..8cf9409ad 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -971,11 +971,11 @@ people using 80-column terminals.

This flag changes the way a merge commit patch is displayed, in a similar way to the -c option. It implies the -c and -p options and further compresses the patch output - by omitting hunks that show differences from only one - parent, or show the same change from all but one parent - for an Octopus merge. When this optimization makes all - hunks disappear, the commit itself and the commit log - message is not shown, just like in any other "empty diff" case. + by omitting uninteresting hunks whose the contents in the parents + have only two variants and the merge result picks one of them + without modification. When all hunks are uninteresting, the commit + itself and the commit log message is not shown, just like in any other + "empty diff" case.

@@ -1855,7 +1855,7 @@ the pathname, but if that is NUL, the record will show two paths.

diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 0e45b58d8..8c8f35b7a 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -93,11 +93,11 @@ include::pretty-options.txt[] This flag changes the way a merge commit patch is displayed, in a similar way to the '-c' option. It implies the '-c' and '-p' options and further compresses the patch output - by omitting hunks that show differences from only one - parent, or show the same change from all but one parent - for an Octopus merge. When this optimization makes all - hunks disappear, the commit itself and the commit log - message is not shown, just like in any other "empty diff" case. + by omitting uninteresting hunks whose the contents in the parents + have only two variants and the merge result picks one of them + without modification. When all hunks are uninteresting, the commit + itself and the commit log message is not shown, just like in any other + "empty diff" case. --always:: Show the commit itself and the commit log message even diff --git a/git-filter-branch.html b/git-filter-branch.html index 9e255390c..4567d3b2f 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -550,7 +550,7 @@ Thus you may instead want to use rm -f filename as the script.

A significantly faster version:

-
git filter-branch --index-filter 'git update-index --remove filename' HEAD
+
git filter-branch --index-filter 'git rm --cached filename' HEAD

Now, you will get the rewritten history saved in HEAD.

To set a commit (which typically is at the tip of another @@ -665,7 +665,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index a3edc0024..7ba9dab5e 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -191,7 +191,7 @@ Thus you may instead want to use `rm -f filename` as the script. A significantly faster version: -------------------------------------------------------------------------- -git filter-branch --index-filter 'git update-index --remove filename' HEAD +git filter-branch --index-filter 'git rm --cached filename' HEAD -------------------------------------------------------------------------- Now, you will get the rewritten history saved in HEAD. diff --git a/git-log.html b/git-log.html index 2e087ed36..48e952527 100644 --- a/git-log.html +++ b/git-log.html @@ -1030,9 +1030,9 @@ options may be given. See git-diff-files(1) fo

This flag implies the -c options and further compresses the - patch output by omitting hunks that show differences from only - one parent, or show the same change from all but one parent for - an Octopus merge. + patch output by omitting uninteresting hunks whose contents in + the parents have only two variants and the merge result picks + one of them without modification.

@@ -2030,7 +2030,7 @@ reversible operation.

diff --git a/git-rerere.html b/git-rerere.html index b57915996..95331b9ac 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -354,7 +354,7 @@ its working state.

This resets the metadata used by rerere if a merge resolution is to be -is aborted. Calling git-am --skip or git-rebase [--skip|--abort] +aborted. Calling git-am [--skip|--abort] or git-rebase [--skip|--abort] will automatically invoke this command.

@@ -529,7 +529,7 @@ conflict.

diff --git a/git-rerere.txt b/git-rerere.txt index beebd5301..89f321b41 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -37,7 +37,7 @@ its working state. 'clear':: This resets the metadata used by rerere if a merge resolution is to be -is aborted. Calling 'git-am --skip' or 'git-rebase [--skip|--abort]' +aborted. Calling 'git-am [--skip|--abort]' or 'git-rebase [--skip|--abort]' will automatically invoke this command. 'diff':: diff --git a/git-rev-list.html b/git-rev-list.html index b7f5bd6e2..d987a1f8a 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -569,9 +569,9 @@ options may be given. See git-diff-files(1) fo

This flag implies the -c options and further compresses the - patch output by omitting hunks that show differences from only - one parent, or show the same change from all but one parent for - an Octopus merge. + patch output by omitting uninteresting hunks whose contents in + the parents have only two variants and the merge result picks + one of them without modification.

@@ -1345,7 +1345,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/rev-list-options.txt b/rev-list-options.txt index b6f5d87e7..3aa38097e 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -112,9 +112,9 @@ options may be given. See linkgit:git-diff-files[1] for more options. --cc:: This flag implies the '-c' options and further compresses the - patch output by omitting hunks that show differences from only - one parent, or show the same change from all but one parent for - an Octopus merge. + patch output by omitting uninteresting hunks whose contents in + the parents have only two variants and the merge result picks + one of them without modification. -r:: diff --git a/technical/api-string-list.html b/technical/api-string-list.html index 7095ff7a2..05ce239fe 100644 --- a/technical/api-string-list.html +++ b/technical/api-string-list.html @@ -367,7 +367,7 @@ memset(&list, 0, sizeof(struct string_list)); string_list_append("foo", &list); string_list_append("bar", &list); for (i = 0; i < list.nr; i++) - printf("%s\n", list.items[i].path) + printf("%s\n", list.items[i].string)
@@ -497,7 +497,7 @@ counterpart for sorted lists, which performs a binary search.

-

Represents an item of the list. The path member is a pointer to the +

Represents an item of the list. The string member is a pointer to the string, and you may use the util member for any purpose, if you want.

  • @@ -534,7 +534,7 @@ Setting the strdup_strings member to 1 will strdup() the strings
diff --git a/technical/api-string-list.txt b/technical/api-string-list.txt index 92b3ecdae..293bb15d2 100644 --- a/technical/api-string-list.txt +++ b/technical/api-string-list.txt @@ -41,7 +41,7 @@ memset(&list, 0, sizeof(struct string_list)); string_list_append("foo", &list); string_list_append("bar", &list); for (i = 0; i < list.nr; i++) - printf("%s\n", list.items[i].path) + printf("%s\n", list.items[i].string) ---- NOTE: It is more efficient to build an unsorted list and sort it @@ -113,7 +113,7 @@ Data structures * `struct string_list_item` -Represents an item of the list. The `path` member is a pointer to the +Represents an item of the list. The `string` member is a pointer to the string, and you may use the `util` member for any purpose, if you want. * `struct string_list`