From 0868a302deebe5253106fdf9af00c82e2c711e66 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 22 Jul 2008 09:20:44 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0-rc0-14-g95f8 --- diff-generate-patch.txt | 2 +- git-am.html | 8 +- git-am.txt | 6 +- git-blame.html | 4 +- git-blame.txt | 2 +- git-branch.html | 4 +- git-branch.txt | 2 +- git-check-attr.html | 102 +++-- git-check-attr.txt | 2 +- git-cherry-pick.html | 4 +- git-cherry-pick.txt | 2 +- git-cherry.html | 4 +- git-cherry.txt | 2 +- git-commit.html | 4 +- git-commit.txt | 2 +- git-count-objects.html | 98 +++-- git-count-objects.txt | 2 +- git-describe.html | 4 +- git-describe.txt | 2 +- git-diff-files.html | 4 +- git-diff-index.html | 4 +- git-diff-tree.html | 4 +- git-diff.html | 302 ++++++++------ git-fetch.html | 4 +- git-fetch.txt | 2 +- git-fmt-merge-msg.html | 4 +- git-fmt-merge-msg.txt | 2 +- git-format-patch.html | 4 +- git-format-patch.txt | 2 +- git-hash-object.html | 4 +- git-hash-object.txt | 2 +- git-log.html | 4 +- git-ls-remote.html | 4 +- git-ls-remote.txt | 2 +- git-ls-tree.html | 114 ++++-- git-ls-tree.txt | 2 +- git-mailinfo.html | 4 +- git-mailinfo.txt | 2 +- git-mailsplit.html | 100 +++-- git-mailsplit.txt | 2 +- git-merge-one-file.html | 4 +- git-merge-one-file.txt | 2 +- git-merge.html | 4 +- git-merge.txt | 2 +- git-mktree.html | 98 +++-- git-mktree.txt | 2 +- git-peek-remote.html | 4 +- git-peek-remote.txt | 2 +- git-pull.html | 4 +- git-pull.txt | 2 +- git-push.html | 4 +- git-push.txt | 2 +- git-rebase.html | 8 +- git-rebase.txt | 6 +- git-reflog.html | 4 +- git-reflog.txt | 2 +- git-request-pull.html | 98 +++-- git-request-pull.txt | 2 +- git-rerere.html | 4 +- git-rerere.txt | 2 +- git-reset.html | 4 +- git-reset.txt | 2 +- git-rev-parse.html | 4 +- git-rev-parse.txt | 2 +- git-revert.html | 4 +- git-revert.txt | 2 +- git-show-branch.html | 4 +- git-show-branch.txt | 2 +- git-show.html | 4 +- git-show.txt | 2 +- git-status.html | 4 +- git-status.txt | 2 +- git-symbolic-ref.html | 4 +- git-symbolic-ref.txt | 2 +- git-tag.html | 4 +- git-tag.txt | 2 +- git-update-server-info.html | 114 ++++-- git-update-server-info.txt | 2 +- git-verify-pack.html | 4 +- git-verify-pack.txt | 2 +- git-whatchanged.html | 4 +- git-whatchanged.txt | 2 +- howto-index.html | 154 +++++--- howto-index.txt | 10 +- howto/rebase-from-internal-branch.txt | 2 +- howto/rebuild-from-update-hook.txt | 2 +- howto/revert-branch-rebase.html | 118 ++++-- howto/revert-branch-rebase.txt | 2 +- howto/separating-topic-branches.txt | 2 +- howto/update-hook-example.txt | 2 +- technical/api-index.html | 90 ++++- technical/api-index.txt | 2 +- technical/api-path-list.txt | 126 ------ technical/api-string-list.html | 541 ++++++++++++++++++++++++++ technical/api-string-list.txt | 128 ++++++ user-manual.html | 4 +- user-manual.txt | 2 +- 97 files changed, 1758 insertions(+), 687 deletions(-) delete mode 100644 technical/api-path-list.txt create mode 100644 technical/api-string-list.html create mode 100644 technical/api-string-list.txt diff --git a/diff-generate-patch.txt b/diff-generate-patch.txt index 029c5f2b8..517e1eba3 100644 --- a/diff-generate-patch.txt +++ b/diff-generate-patch.txt @@ -96,7 +96,7 @@ index fabadb8,cc95eb0..4866510 + or like this (when '--cc' option is used): - diff --c file + diff --cc file 2. It is followed by one or more extended header lines (this example shows a merge with two parents): diff --git a/git-am.html b/git-am.html index f06361895..474d025d4 100644 --- a/git-am.html +++ b/git-am.html @@ -557,9 +557,9 @@ hand resolve the conflict in the working directory, and update

-

The command refuses to process new mailboxes while .git/rebase +

The command refuses to process new mailboxes while .git/rebase-apply directory exists, so if you decide to start over from scratch, -run rm -f -r .git/rebase before running the command with mailbox +run rm -f -r .git/rebase-apply before running the command with mailbox names.

Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple @@ -573,7 +573,7 @@ errors in the "From:" lines).

Author

-

Written by Junio C Hamano <junkio@cox.net>

+

Written by Junio C Hamano <gitster@pobox.com>

Documentation

@@ -585,7 +585,7 @@ errors in the "From:" lines).

diff --git a/git-am.txt b/git-am.txt index e010a1649..c45c53ec2 100644 --- a/git-am.txt +++ b/git-am.txt @@ -143,9 +143,9 @@ aborts in the middle,. You can recover from this in one of two ways: the index file to bring it in a state that the patch should have produced. Then run the command with '--resolved' option. -The command refuses to process new mailboxes while `.git/rebase` +The command refuses to process new mailboxes while `.git/rebase-apply` directory exists, so if you decide to start over from scratch, -run `rm -f -r .git/rebase` before running the command with mailbox +run `rm -f -r .git/rebase-apply` before running the command with mailbox names. Before any patches are applied, ORIG_HEAD is set to the tip of the @@ -162,7 +162,7 @@ linkgit:git-apply[1]. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-blame.html b/git-blame.html index 1e92ad4e5..f7d0dce5c 100644 --- a/git-blame.html +++ b/git-blame.html @@ -738,7 +738,7 @@ commit commentary), a blame viewer won't ever care.

AUTHOR

-

Written by Junio C Hamano <junkio@cox.net>

+

Written by Junio C Hamano <gitster@pobox.com>

GIT

@@ -746,7 +746,7 @@ commit commentary), a blame viewer won't ever care.
diff --git a/git-blame.txt b/git-blame.txt index 34b24a3ca..fba374d65 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -190,7 +190,7 @@ linkgit:git-annotate[1] AUTHOR ------ -Written by Junio C Hamano +Written by Junio C Hamano GIT --- diff --git a/git-branch.html b/git-branch.html index d0c3c5e56..f89ea39c5 100644 --- a/git-branch.html +++ b/git-branch.html @@ -653,7 +653,7 @@ but different purposes:

Author

-

Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>

+

Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <gitster@pobox.com>

Documentation

@@ -665,7 +665,7 @@ but different purposes:

diff --git a/git-branch.txt b/git-branch.txt index fc5a4a602..6103d62fe 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -205,7 +205,7 @@ but different purposes: Author ------ -Written by Linus Torvalds and Junio C Hamano +Written by Linus Torvalds and Junio C Hamano Documentation -------------- diff --git a/git-check-attr.html b/git-check-attr.html index b11c6d868..13619e41e 100644 --- a/git-check-attr.html +++ b/git-check-attr.html @@ -3,7 +3,7 @@ - + git-check-attr(1) @@ -272,16 +320,16 @@ git-check-attr(1) Manual Page

SYNOPSIS

-

git check-attr attr… [--] pathname…

+

git check-attr attr… [--] pathname…

-

DESCRIPTION

+

DESCRIPTION

-

For every pathname, this command will list if each attr is unspecified, -set, or unset as a gitattribute on that pathname.

+

For every pathname, this command will list if each attr is unspecified, +set, or unset as a gitattribute on that pathname.

-

OPTIONS

+

OPTIONS

-
+
--
@@ -292,27 +340,27 @@ git-check-attr(1) Manual Page be treated as an attribute.

-
+
-

SEE ALSO

+

SEE ALSO

-

gitattributes(5).

+

gitattributes(5).

-

Author

+

Author

-

Written by Junio C Hamano <junkio@cox.net>

+

Written by Junio C Hamano <gitster@pobox.com>

-

Documentation

+

Documentation

-

Documentation by James Bowes.

+

Documentation by James Bowes.

-

GIT

+

GIT

-

Part of the git(1) suite

+

Part of the git(1) suite

diff --git a/git-check-attr.txt b/git-check-attr.txt index abe1f1b7d..2b821f2a1 100644 --- a/git-check-attr.txt +++ b/git-check-attr.txt @@ -30,7 +30,7 @@ linkgit:gitattributes[5]. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 163a825de..20b597789 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -431,7 +431,7 @@ effect to your index in a row.

Author

-

Written by Junio C Hamano <junkio@cox.net>

+

Written by Junio C Hamano <gitster@pobox.com>

Documentation

@@ -443,7 +443,7 @@ effect to your index in a row.

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 50fb3d5d5..837fb08b7 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -74,7 +74,7 @@ effect to your index in a row. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-cherry.html b/git-cherry.html index 1e6195d89..7ddf242c7 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -398,7 +398,7 @@ than pushing or pulling commits directly.

Author

-

Written by Junio C Hamano <junkio@cox.net>

+

Written by Junio C Hamano <gitster@pobox.com>

Documentation

@@ -410,7 +410,7 @@ than pushing or pulling commits directly.

diff --git a/git-cherry.txt b/git-cherry.txt index d761a7342..74d14c4e7 100644 --- a/git-cherry.txt +++ b/git-cherry.txt @@ -64,7 +64,7 @@ linkgit:git-patch-id[1] Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-commit.html b/git-commit.html index e18732ada..1b21a4c8b 100644 --- a/git-commit.html +++ b/git-commit.html @@ -853,7 +853,7 @@ information.

Author

Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net>

+Junio C Hamano <gitster@pobox.com>

GIT

@@ -861,7 +861,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 01bd2d6b7..0e25bb862 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -331,7 +331,7 @@ linkgit:git-commit-tree[1] Author ------ Written by Linus Torvalds and -Junio C Hamano +Junio C Hamano GIT diff --git a/git-count-objects.html b/git-count-objects.html index 800b68c12..689f3d8a2 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -3,7 +3,7 @@ - + git-count-objects(1) @@ -272,16 +320,16 @@ git-count-objects(1) Manual Page

SYNOPSIS

-

git count-objects [-v]

+

git count-objects [-v]

-

DESCRIPTION

+

DESCRIPTION

-

This counts the number of unpacked object files and disk space consumed by -them, to help you decide when it is a good time to repack.

+

This counts the number of unpacked object files and disk space consumed by +them, to help you decide when it is a good time to repack.

-

OPTIONS

+

OPTIONS

-
+
-v
@@ -296,23 +344,23 @@ them, to help you decide when it is a good time to repack.

removed by running git prune-packed.

-
+
-

Author

+

Author

-

Written by Junio C Hamano <junkio@cox.net>

+

Written by Junio C Hamano <gitster@pobox.com>

-

Documentation

+

Documentation

-

Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

+

Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

-

GIT

+

GIT

-

Part of the git(1) suite

+

Part of the git(1) suite

diff --git a/git-count-objects.txt b/git-count-objects.txt index c069cc8b0..75a8da1ca 100644 --- a/git-count-objects.txt +++ b/git-count-objects.txt @@ -27,7 +27,7 @@ OPTIONS Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-describe.html b/git-describe.html index 3ea45a471..3acc7ab2b 100644 --- a/git-describe.html +++ b/git-describe.html @@ -505,7 +505,7 @@ will be the smallest number of commits possible.

Author

Written by Linus Torvalds <torvalds@osdl.org>, but somewhat -butchered by Junio C Hamano <junkio@cox.net>. Later significantly +butchered by Junio C Hamano <gitster@pobox.com>. Later significantly updated by Shawn Pearce <spearce@spearce.org>.

Documentation

@@ -518,7 +518,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

diff --git a/git-describe.txt b/git-describe.txt index 44b166888..7fdda04ba 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -136,7 +136,7 @@ will be the smallest number of commits possible. Author ------ Written by Linus Torvalds , but somewhat -butchered by Junio C Hamano . Later significantly +butchered by Junio C Hamano . Later significantly updated by Shawn Pearce . Documentation diff --git a/git-diff-files.html b/git-diff-files.html index fb9ca3474..5265df0dd 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -1135,7 +1135,7 @@ It is preceded with a "git diff" header, that looks like

or like this (when --cc option is used):

-
diff --c file
+
diff --cc file
  • @@ -1339,7 +1339,7 @@ the pathname, but if that is NUL, the record will show two paths.

    diff --git a/git-diff-index.html b/git-diff-index.html index 83f7c15ae..76a3efc91 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1128,7 +1128,7 @@ It is preceded with a "git diff" header, that looks like

    or like this (when --cc option is used):

    -
    diff --c file
    +
    diff --cc file
  • @@ -1426,7 +1426,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index 52f90644f..3f9519e74 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1651,7 +1651,7 @@ It is preceded with a "git diff" header, that looks like

    or like this (when --cc option is used):

    -
    diff --c file
    +
    diff --cc file
  • @@ -1855,7 +1855,7 @@ the pathname, but if that is NUL, the record will show two paths.

    diff --git a/git-diff.html b/git-diff.html index 6ccba6cc6..2ec015d0c 100644 --- a/git-diff.html +++ b/git-diff.html @@ -3,7 +3,7 @@ - + git-diff(1) @@ -272,13 +320,13 @@ git-diff(1) Manual Page

    SYNOPSIS

    -

    git diff [<common diff options>] <commit>{0,2} [--] [<path>…]

    +

    git diff [<common diff options>] <commit>{0,2} [--] [<path>…]

    -

    DESCRIPTION

    +

    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.

    -
    +

    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] [--] [<path>…]
    @@ -286,13 +334,13 @@ tree and the index file, or the index file and the working tree.

    This form is to view the changes you made relative to the index (staging area for the next commit). In other - words, the differences are what you _could_ tell git to + 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 git-add(1).

    -

    If exactly two paths are given, and at least one is untracked, +

    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.

    +forced by --no-index.

    git diff [--options] --cached [<commit>] [--] [<path>…] @@ -348,21 +396,21 @@ forced by --no-index.

    of <commit>, which has the same effect as using HEAD instead.

    -
    -

    Just in case if you are doing something exotic, it should be +

    +

    Just in case if you are doing something exotic, it should be noted that all of the <commit> in the above description, except for the last two forms that use ".." notations, can be any -<tree-ish>.

    -

    For a more complete list of ways to spell <commit>, see +<tree-ish>.

    +

    For a more complete list of ways to spell <commit>, see "SPECIFYING REVISIONS" section in git-rev-parse(1). -However, "diff" is about comparing two _endpoints_, not ranges, +However, "diff" is about comparing two endpoints, not ranges, and the range notations ("<commit>..<commit>" and "<commit>...<commit>") do not mean a range as defined in the -"SPECIFYING RANGES" section in git-rev-parse(1).

    +"SPECIFYING RANGES" section in git-rev-parse(1).

    -

    OPTIONS

    +

    OPTIONS

    -
    +
    -p
    @@ -834,10 +882,10 @@ and the range notations ("<commit>..<commit>" and Do not show any source or destination prefix.

    -
    -

    For more detailed explanation on these common options, see also -gitdiffcore(7).

    -
    +
    +

    For more detailed explanation on these common options, see also +gitdiffcore(7).

    +
    <path>…
    @@ -848,15 +896,15 @@ and the range notations ("<commit>..<commit>" and names and get diff for all files under them).

    -
    +
    -

    Output format

    +

    Output format

    -

    The output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar.

    -

    These commands all compare two sets of things; what is -compared differs:

    -
    +

    The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar.

    +

    These commands all compare two sets of things; what is +compared differs:

    +
    git-diff-index <tree-ish>
    @@ -889,8 +937,8 @@ git-diff-files [<pattern>…] compares the index and the files on the filesystem.

    -
    -

    An output line is formatted this way:

    +
    +

    An output line is formatted this way:

    in-place edit  :100644 100644 bcd1234... 0123456... M file0
@@ -900,8 +948,8 @@ create         :000000 100644 0000000... 1234567... A file4
 delete         :100644 000000 1234567... 0000000... D file5
 unmerged       :000000 000000 0000000... 0000000... U file6
    -

    That is, from the left to the right:

    -
      +

      That is, from the left to the right:

      +

      1. a colon. @@ -977,25 +1025,25 @@ path for "dst"; only exists for C or R. an LF or a NUL when -z option is used, to terminate the record.

        2. -
      -

      <sha1> is shown as all 0's if a file is new on the filesystem -and it is out of sync with the index.

      -

      Example:

      +
    +

    <sha1> is shown as all 0's if a file is new on the filesystem +and it is out of sync with the index.

    +

    Example:

    :100644 100644 5be4a4...... 000000...... M file.c
    -

    When -z option is not used, TAB, LF, and backslash characters +

    When -z option is not used, TAB, LF, and backslash characters in pathnames are represented as \t, \n, and \\, -respectively.

    +respectively.

    -

    diff format for merges

    +

    diff format for merges

    -

    "git-diff-tree", "git-diff-files" and "git-diff --raw" +

    "git-diff-tree", "git-diff-files" and "git-diff --raw" can take -c or --cc option to generate diff output also for merge commits. The output differs -from the format described above in the following way:

    -
      +from the format described above in the following way:

    +

    1. there is a colon for each parent @@ -1021,26 +1069,26 @@ no optional "score" number single path, only for "dst"

      2. -
    -

    Example:

    +
    +

    Example:

    ::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM      describe.c
    -

    Note that combined diff lists only files which were modified from -all parents.

    +

    Note that combined diff lists only files which were modified from +all parents.

    -

    Generating patches with -p

    +

    Generating patches with -p

    -

    When "git-diff-index", "git-diff-tree", or "git-diff-files" are run +

    When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a -p option, "git diff" without the --raw option, or "git log" with the "-p" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the -GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.

    -

    What the -p option produces is slightly different from the traditional -diff format.

    -
      +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.

    +

    What the -p option produces is slightly different from the traditional +diff format.

    +

    1. It is preceded with a "git diff" header, that looks like @@ -1050,12 +1098,12 @@ It is preceded with a "git diff" header, that looks like 

      diff --git a/file1 b/file2
    -

    The a/ and b/ filenames are the same unless rename/copy is +

    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.

    -

    When rename/copy is involved, file1 and file2 show the +/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.

    +the file that rename/copy produces, respectively.

  • @@ -1084,20 +1132,20 @@ TAB, LF, double quote and backslash characters in pathnames pathname is put in double quotes.

    • - -

    The similarity index is the percentage of unchanged lines, and + +

    The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old -file made it into the new one.

    +file made it into the new one.

    -

    combined diff format

    +

    combined diff format

    -

    "git-diff-tree", "git-diff-files" and "git-diff" can take -c or +

    "git-diff-tree", "git-diff-files" and "git-diff" can take -c or --cc option to produce combined diff. For showing a merge commit with "git log -p", this is the default format. -A combined diff format looks like this:

    +A combined diff format looks like this:

    diff --combined describe.c
@@ -1128,7 +1176,7 @@ index fabadb8,cc95eb0..4866510
                 initialized = 1;
                 for_each_ref(get_name);
    -
      +

      1. It is preceded with a "git diff" header, that looks like @@ -1138,10 +1186,10 @@ It is preceded with a "git diff" header, that looks like 

        diff --combined file
      -

      or like this (when --cc option is used):

      +

      or like this (when --cc option is used):

      -
      diff --c file
      +
      diff --cc file
    1. @@ -1156,11 +1204,11 @@ mode <mode>,<mode>..<mode> new file mode <mode> deleted file mode <mode>,<mode>
    -

    The mode <mode>,<mode>..<mode> line appears only if at least one of +

    The mode <mode>,<mode>..<mode> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two -<tree-ish> and are not used by combined diff format.

    +<tree-ish> and are not used by combined diff format.

  • @@ -1171,9 +1219,9 @@ It is followed by two-line from-file/to-file header 

    --- a/file
 +++ b/file
    -

    Similar to two-line header for traditional unified diff +

    Similar to two-line header for traditional unified diff format, /dev/null is used to signal created or deleted -files.

    +files.

  • @@ -1187,59 +1235,59 @@ Chunk header format is modified to prevent people from 

    @@@ <from-file-range> <from-file-range> <to-file-range> @@@
    -

    There are (number of parents + 1) @ characters in the chunk -header for combined diff format.

    +

    There are (number of parents + 1) @ characters in the chunk +header for combined diff format.

    • - -

    Unlike the traditional unified diff format, which shows two + +

    Unlike the traditional unified diff format, which shows two files A and B with a single column that has - (minus — appears in A but removed in B), + (plus — missing in A but added to B), or " " (space — unchanged) prefix, this format compares two or more files file1, file2,… with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is -different from it.

    -

    A - character in the column N means that the line appears in +different from it.

    +

    A - character in the column N means that the line appears in fileN but it does not appear in the result. A + character in the column N means that the line appears in the last file, 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 +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 +).

    -

    When shown by git diff-tree -c, it compares the parents of a +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 two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka -"their version").

    +"their version").

    -

    other diff formats

    +

    other diff formats

    -

    The --summary option describes newly added, deleted, renamed and +

    The --summary option describes newly added, deleted, renamed and copied files. The --stat option adds diffstat(1) graph to the output. These options can be combined with other options, such as --p, and are meant for human consumption.

    -

    When showing a change that involves a rename or a copy, --stat output +-p, and are meant for human consumption.

    +

    When showing a change that involves a rename or a copy, --stat output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves arch/i386/Makefile to -arch/x86/Makefile while modifying 4 lines will be shown like this:

    +arch/x86/Makefile while modifying 4 lines will be shown like this:

    arch/{i386 => x86}/Makefile    |   4 +--
    -

    The --numstat option gives the diffstat(1) information but is designed +

    The --numstat option gives the diffstat(1) information but is designed for easier machine consumption. An entry in --numstat output looks -like this:

    +like this:

    1       2       README
 3       1       arch/{i386 => x86}/Makefile
    -

    That is, from left to right:

    -
      +

      That is, from left to right:

      +

      1. the number of added lines; @@ -1270,15 +1318,15 @@ pathname (possibly with rename/copy information); a newline.

        2. -
      -

      When -z output option is in effect, the output is formatted this way:

      +
    +

    When -z output option is in effect, the output is formatted this way:

    1       2       README NUL
 3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL
    -

    That is:

    -
      +

      That is:

      +

      1. the number of added lines; @@ -1324,16 +1372,16 @@ pathname in postimage (only exists if renamed/copied); a NUL.

        2. -
      -

      The extra NUL before the preimage path in renamed case is to allow +

    +

    The extra NUL before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to NUL would yield -the pathname, but if that is NUL, the record will show two paths.

    +the pathname, but if that is NUL, the record will show two paths.

    -

    EXAMPLES

    +

    EXAMPLES

    -
    +
    Various ways to check your working tree
    @@ -1344,7 +1392,7 @@ Various ways to check your working tree $ git diff --cached (2) $ git diff HEAD (3)
    -
      +

      1. Changes in the working tree not yet staged for the next commit. @@ -1362,7 +1410,7 @@ Changes in the working tree since your last commit; what you would be committing if you run "git commit -a"

        2. -
      +
    Comparing with arbitrary commits @@ -1374,7 +1422,7 @@ Comparing with arbitrary commits $ git diff HEAD -- ./test (2) $ git diff HEAD^ HEAD (3) -
      +

      1. Instead of using the tip of the current branch, compare with the @@ -1393,7 +1441,7 @@ file "test". Compare the version before the last commit and the last commit.

        2. -
      +
    Comparing branches @@ -1405,7 +1453,7 @@ Comparing branches $ git diff topic..master (2) $ git diff topic...master (3) -
      +

      1. Changes between the tips of the topic and the master branches. @@ -1422,7 +1470,7 @@ Changes that occurred on the master branch since when the topic branch was started off it.

        2. -
      +
    Limiting the diff output @@ -1434,7 +1482,7 @@ Limiting the diff output $ git diff --name-status (2) $ git diff arch/i386 include/asm-i386 (3) -
      +

      1. Show only modification, rename and copy, but not addition @@ -1452,7 +1500,7 @@ diff output. Limit diff output to named subtrees.

        2. -
      +
    Munging the diff output @@ -1463,7 +1511,7 @@ Munging the diff output 
    $ git diff --find-copies-harder -B -C  (1)
 $ git diff -R                          (2)
    -
      +

      1. Spend extra cycles to find renames, copies and complete @@ -1475,25 +1523,25 @@ rewrites (very expensive). Output diff in reverse.

        2. -
      +
    - + -

    Author

    +

    Author

    -

    Written by Linus Torvalds <torvalds@osdl.org>

    +

    Written by Linus Torvalds <torvalds@osdl.org>

    -

    Documentation

    +

    Documentation

    -

    Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

    +

    Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

    -

    GIT

    +

    GIT

    -

    Part of the git(1) suite

    +

    Part of the git(1) suite

    diff --git a/git-fetch.html b/git-fetch.html index 7f656d1f5..4cd3ad6c4 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -769,7 +769,7 @@ you provided in the command line.

    Author

    Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net>

    +Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -781,7 +781,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-fetch.txt b/git-fetch.txt index 9e048a8a2..d3164c5c8 100644 --- a/git-fetch.txt +++ b/git-fetch.txt @@ -45,7 +45,7 @@ linkgit:git-pull[1] Author ------ Written by Linus Torvalds and -Junio C Hamano +Junio C Hamano Documentation ------------- diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 3e1905a91..6811789cd 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -409,7 +409,7 @@ merge.summary

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -421,7 +421,7 @@ merge.summary
    diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 885edf005..1c24796d6 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -61,7 +61,7 @@ linkgit:git-merge[1] Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-format-patch.html b/git-format-patch.html index cabd928c4..7592581c3 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -1139,7 +1139,7 @@ as e-mailable patches:

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -1151,7 +1151,7 @@ as e-mailable patches:
    diff --git a/git-format-patch.txt b/git-format-patch.txt index 7c2ff3eb2..010d9e432 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -235,7 +235,7 @@ linkgit:git-am[1], linkgit:git-send-email[1] Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-hash-object.html b/git-hash-object.html index ea0909ecf..0f760f0d2 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -371,7 +371,7 @@ specified, it defaults to "blob".

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -383,7 +383,7 @@ specified, it defaults to "blob".

    diff --git a/git-hash-object.txt b/git-hash-object.txt index 9e654fc41..ac928e198 100644 --- a/git-hash-object.txt +++ b/git-hash-object.txt @@ -37,7 +37,7 @@ OPTIONS Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-log.html b/git-log.html index f48d4592d..2e087ed36 100644 --- a/git-log.html +++ b/git-log.html @@ -1814,7 +1814,7 @@ It is preceded with a "git diff" header, that looks like

    or like this (when --cc option is used):

    -
    diff --c file
    +
    diff --cc file
  • @@ -2030,7 +2030,7 @@ reversible operation.

    diff --git a/git-ls-remote.html b/git-ls-remote.html index a29ca8d58..ba7210c3d 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -413,7 +413,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    GIT

    @@ -421,7 +421,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
    diff --git a/git-ls-remote.txt b/git-ls-remote.txt index 4f252441e..abe7bf9ff 100644 --- a/git-ls-remote.txt +++ b/git-ls-remote.txt @@ -69,7 +69,7 @@ EXAMPLES Author ------ -Written by Junio C Hamano +Written by Junio C Hamano GIT --- diff --git a/git-ls-tree.html b/git-ls-tree.html index b98d019ee..435b8bbc6 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -3,7 +3,7 @@ - + git-ls-tree(1) @@ -277,17 +325,17 @@ git-ls-tree(1) Manual Page [--name-only] [--name-status] [--full-name] [--abbrev=[<n>]] <tree-ish> [paths…] -

    DESCRIPTION

    +

    DESCRIPTION

    -

    Lists the contents of a given tree object, like what "/bin/ls -a" does +

    Lists the contents of a given tree object, like what "/bin/ls -a" does in the current working directory. Note that the usage is subtly different, though - paths denote just a list of patterns to match, e.g. so specifying directory name (without -r) will behave differently, and order of the -arguments does not matter.

    +arguments does not matter.

    -

    OPTIONS

    +

    OPTIONS

    -
    +
    <tree-ish>
    @@ -380,43 +428,43 @@ paths implicitly uses the root level of the tree as the sole path argument.

    -
    +
    -

    Output Format

    +

    Output Format

    <mode> SP <type> SP <object> TAB <file>
    -

    When the -z option is not used, TAB, LF, and backslash characters -in pathnames are represented as \t, \n, and \\, respectively.

    -

    When the -l option is used, format changes to

    +

    When the -z option is not used, TAB, LF, and backslash characters +in pathnames are represented as \t, \n, and \\, respectively.

    +

    When the -l option is used, format changes to

    <mode> SP <type> SP <object> SP <object size> TAB <file>
    -

    Object size identified by <object> is given in bytes, and right-justified +

    Object size identified by <object> is given in bytes, and right-justified with minimum width of 7 characters. Object size is given only for blobs -(file) entries; for other entries - character is used in place of size.

    +(file) entries; for other entries - character is used in place of size.

    -

    Author

    +

    Author

    -

    Written by Petr Baudis <pasky@suse.cz> -Completely rewritten from scratch by Junio C Hamano <junkio@cox.net>, -another major rewrite by Linus Torvalds <torvalds@osdl.org>

    +

    Written by Petr Baudis <pasky@suse.cz> +Completely rewritten from scratch by Junio C Hamano <gitster@pobox.com>, +another major rewrite by Linus Torvalds <torvalds@osdl.org>

    -

    Documentation

    +

    Documentation

    -

    Documentation by David Greaves, Junio C Hamano and the git-list -<git@vger.kernel.org>.

    +

    Documentation by David Greaves, Junio C Hamano and the git-list +<git@vger.kernel.org>.

    -

    GIT

    +

    GIT

    -

    Part of the git(1) suite

    +

    Part of the git(1) suite

    diff --git a/git-ls-tree.txt b/git-ls-tree.txt index 1cdec222a..d7e73f568 100644 --- a/git-ls-tree.txt +++ b/git-ls-tree.txt @@ -81,7 +81,7 @@ with minimum width of 7 characters. Object size is given only for blobs Author ------ Written by Petr Baudis -Completely rewritten from scratch by Junio C Hamano , +Completely rewritten from scratch by Junio C Hamano , another major rewrite by Linus Torvalds Documentation diff --git a/git-mailinfo.html b/git-mailinfo.html index 6bb6bcb00..fbb69bdad 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -401,7 +401,7 @@ conversion, even with this flag.

    Author

    Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net>

    +Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -413,7 +413,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-mailinfo.txt b/git-mailinfo.txt index 316bcc679..31eccea5b 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt @@ -60,7 +60,7 @@ conversion, even with this flag. Author ------ Written by Linus Torvalds and -Junio C Hamano +Junio C Hamano Documentation diff --git a/git-mailsplit.html b/git-mailsplit.html index ababbb95a..1e856c28d 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -3,7 +3,7 @@ - + git-mailsplit(1) @@ -272,12 +320,12 @@ git-mailsplit(1) Manual Page

    SYNOPSIS

    -

    git mailsplit [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>|<Maildir>…]

    +

    git mailsplit [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>|<Maildir>…]

    -

    DESCRIPTION

    +

    DESCRIPTION

    -

    Splits a mbox file or a Maildir into a list of files: "0001" "0002" .. in the -specified directory so you can process them further from there.

    +

    Splits a mbox file or a Maildir into a list of files: "0001" "0002" .. in the +specified directory so you can process them further from there.

    @@ -288,9 +336,9 @@ patches in the correct order.
    -

    OPTIONS

    +

    OPTIONS

    -
    +
    <mbox>
    @@ -345,24 +393,24 @@ patches in the correct order. start the numbering with 0004.

    -
    +
    -

    Author

    +

    Author

    -

    Written by Linus Torvalds <torvalds@osdl.org> -and Junio C Hamano <junkio@cox.net>

    +

    Written by Linus Torvalds <torvalds@osdl.org> +and Junio C Hamano <gitster@pobox.com>

    -

    Documentation

    +

    Documentation

    -

    Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

    +

    Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

    -

    GIT

    +

    GIT

    -

    Part of the git(1) suite

    +

    Part of the git(1) suite

    diff --git a/git-mailsplit.txt b/git-mailsplit.txt index acd712b1c..5cc94ec53 100644 --- a/git-mailsplit.txt +++ b/git-mailsplit.txt @@ -46,7 +46,7 @@ OPTIONS Author ------ Written by Linus Torvalds -and Junio C Hamano +and Junio C Hamano Documentation diff --git a/git-merge-one-file.html b/git-merge-one-file.html index d40203f53..d28328ac5 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -330,7 +330,7 @@ to resolve a merge after the trivial merge done with git-read-tree -m.<

    Author

    Written by Linus Torvalds <torvalds@osdl.org>, -Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.

    +Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.

    Documentation

    @@ -342,7 +342,7 @@ Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.

    diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt index 1dd134538..dc8a96adb 100644 --- a/git-merge-one-file.txt +++ b/git-merge-one-file.txt @@ -18,7 +18,7 @@ to resolve a merge after the trivial merge done with 'git-read-tree -m'. Author ------ Written by Linus Torvalds , -Junio C Hamano and Petr Baudis . +Junio C Hamano and Petr Baudis . Documentation -------------- diff --git a/git-merge.html b/git-merge.html index 1e0bf58a0..ee1fdfbdc 100644 --- a/git-merge.html +++ b/git-merge.html @@ -789,7 +789,7 @@ Resolve the conflicts. git diff would report only the

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -801,7 +801,7 @@ Resolve the conflicts. git diff would report only the
    diff --git a/git-merge.txt b/git-merge.txt index a7487d3df..2db888098 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -145,7 +145,7 @@ linkgit:git-mergetool[1] Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation diff --git a/git-mktree.html b/git-mktree.html index c11fdc780..6cca24a65 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -3,7 +3,7 @@ - + git-mktree(1) @@ -272,17 +320,17 @@ git-mktree(1) Manual Page

    SYNOPSIS

    -

    git mktree [-z]

    +

    git mktree [-z]

    -

    DESCRIPTION

    +

    DESCRIPTION

    -

    Reads standard input in non-recursive ls-tree output format, +

    Reads standard input in non-recursive ls-tree output format, and creates a tree object. The object name of the tree object -built is written to the standard output.

    +built is written to the standard output.

    -

    OPTIONS

    +

    OPTIONS

    -
    +
    -z
    @@ -291,23 +339,23 @@ built is written to the standard output.

    Read the NUL-terminated ls-tree -z output instead.

    -
    +
    -

    Author

    +

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    -

    Documentation

    +

    Documentation

    -

    Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

    +

    Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

    -

    GIT

    +

    GIT

    -

    Part of the git(1) suite

    +

    Part of the git(1) suite

    diff --git a/git-mktree.txt b/git-mktree.txt index 0be32e261..af19f06ed 100644 --- a/git-mktree.txt +++ b/git-mktree.txt @@ -23,7 +23,7 @@ OPTIONS Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-peek-remote.html b/git-peek-remote.html index 7abfb68cc..a82a65309 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -368,7 +368,7 @@ git-peek-remote(1) Manual Page

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -380,7 +380,7 @@ git-peek-remote(1) Manual Page
    diff --git a/git-peek-remote.txt b/git-peek-remote.txt index 79c03ee7f..8282a5e82 100644 --- a/git-peek-remote.txt +++ b/git-peek-remote.txt @@ -39,7 +39,7 @@ OPTIONS Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-pull.html b/git-pull.html index e4538cdc0..c9c3fb5dc 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1135,7 +1135,7 @@ would want to start over, you can recover with git-reset.

    Author

    Written by Linus Torvalds <torvalds@osdl.org> -and Junio C Hamano <junkio@cox.net>

    +and Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -1149,7 +1149,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

    diff --git a/git-pull.txt b/git-pull.txt index 092d1b8a3..7578623ed 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -193,7 +193,7 @@ linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1] Author ------ Written by Linus Torvalds -and Junio C Hamano +and Junio C Hamano Documentation -------------- diff --git a/git-push.html b/git-push.html index c08ddb54d..bf542f586 100644 --- a/git-push.html +++ b/git-push.html @@ -804,7 +804,7 @@ git push origin master:refs/heads/experimental

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>, later rewritten in C +

    Written by Junio C Hamano <gitster@pobox.com>, later rewritten in C by Linus Torvalds <torvalds@osdl.org>

    Documentation

    @@ -817,7 +817,7 @@ by Linus Torvalds <torvalds@osdl.org>

    diff --git a/git-push.txt b/git-push.txt index c44dce374..94d07ab81 100644 --- a/git-push.txt +++ b/git-push.txt @@ -195,7 +195,7 @@ git push origin master:refs/heads/experimental:: Author ------ -Written by Junio C Hamano , later rewritten in C +Written by Junio C Hamano , later rewritten in C by Linus Torvalds Documentation diff --git a/git-rebase.html b/git-rebase.html index 13743b180..e67b2d42a 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -348,8 +348,8 @@ with a different commit message or timestamp will be skipped).

    completely automatic. You will have to resolve any such merge failure and run git rebase --continue. Another option is to bypass the commit that caused the merge failure with git rebase --skip. To restore the -original <branch> and remove the .git/rebase working files, use the command -git rebase --abort instead.

    +original <branch> and remove the .git/rebase-apply working files, use the +command git rebase --abort instead.

    Assume the following history exists and the current branch is "topic":

    @@ -894,7 +894,7 @@ after each commit, test, and amend the commit if fixes are necessary.

    Authors

    -

    Written by Junio C Hamano <junkio@cox.net> and +

    Written by Junio C Hamano <gitster@pobox.com> and Johannes E. Schindelin <johannes.schindelin@gmx.de>

    Documentation

    @@ -907,7 +907,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

    diff --git a/git-rebase.txt b/git-rebase.txt index 51afc87e1..59c1b021a 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -39,8 +39,8 @@ It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To restore the -original and remove the .git/rebase working files, use the command -`git rebase --abort` instead. +original and remove the .git/rebase-apply working files, use the +command `git rebase --abort` instead. Assume the following history exists and the current branch is "topic": @@ -398,7 +398,7 @@ after each commit, test, and amend the commit if fixes are necessary. Authors ------ -Written by Junio C Hamano and +Written by Junio C Hamano and Johannes E. Schindelin Documentation diff --git a/git-reflog.html b/git-reflog.html index 745b5690e..3b50cb2cc 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -435,7 +435,7 @@ them.

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -447,7 +447,7 @@ them.

    diff --git a/git-reflog.txt b/git-reflog.txt index 146d7f545..d99236e14 100644 --- a/git-reflog.txt +++ b/git-reflog.txt @@ -94,7 +94,7 @@ them. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-request-pull.html b/git-request-pull.html index 0ef5cf2d3..762e3c793 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -3,7 +3,7 @@ - + git-request-pull(1) @@ -272,16 +320,16 @@ git-request-pull(1) Manual Page

    SYNOPSIS

    -

    git request-pull <start> <url> [<end>]

    +

    git request-pull <start> <url> [<end>]

    -

    DESCRIPTION

    +

    DESCRIPTION

    -

    Summarizes the changes between two commits to the standard output, and includes -the given URL in the generated summary.

    +

    Summarizes the changes between two commits to the standard output, and includes +the given URL in the generated summary.

    -

    OPTIONS

    +

    OPTIONS

    -
    +
    <start>
    @@ -306,23 +354,23 @@ the given URL in the generated summary.

    Commit to end at; defaults to HEAD.

    -
    +
    -

    Author

    +

    Author

    -

    Written by Ryan Anderson <ryan@michonline.com> and Junio C Hamano <junkio@cox.net>

    +

    Written by Ryan Anderson <ryan@michonline.com> and Junio C Hamano <gitster@pobox.com>

    -

    Documentation

    +

    Documentation

    -

    Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

    +

    Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

    -

    GIT

    +

    GIT

    -

    Part of the git(1) suite

    +

    Part of the git(1) suite

    diff --git a/git-request-pull.txt b/git-request-pull.txt index ca6843032..19335fdda 100644 --- a/git-request-pull.txt +++ b/git-request-pull.txt @@ -28,7 +28,7 @@ OPTIONS Author ------ -Written by Ryan Anderson and Junio C Hamano +Written by Ryan Anderson and Junio C Hamano Documentation -------------- diff --git a/git-rerere.html b/git-rerere.html index 9c5b43a0b..b57915996 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -521,7 +521,7 @@ conflict.

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    GIT

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

    diff --git a/git-rerere.txt b/git-rerere.txt index 678bfd3cd..beebd5301 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -204,7 +204,7 @@ conflict. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano GIT --- diff --git a/git-reset.html b/git-reset.html index 980c50b9e..33b03fd80 100644 --- a/git-reset.html +++ b/git-reset.html @@ -643,7 +643,7 @@ Adds the file to the index again.

    Author

    -

    Written by Junio C Hamano <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org>

    +

    Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds <torvalds@osdl.org>

    Documentation

    @@ -655,7 +655,7 @@ Adds the file to the index again.
    diff --git a/git-reset.txt b/git-reset.txt index c8d175768..6abaeac28 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -195,7 +195,7 @@ $ git add frotz.c <3> Author ------ -Written by Junio C Hamano and Linus Torvalds +Written by Junio C Hamano and Linus Torvalds Documentation -------------- diff --git a/git-rev-parse.html b/git-rev-parse.html index 9b3229b17..f93966932 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -961,7 +961,7 @@ Same as above:

    Author

    Written by Linus Torvalds <torvalds@osdl.org> . -Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.org>

    +Junio C Hamano <gitster@pobox.com> and Pierre Habouzit <madcoder@debian.org>

    Documentation

    @@ -973,7 +973,7 @@ Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.or
    diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 088f971b7..5c936693d 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -426,7 +426,7 @@ but if $REV is empty, the commit object name from master will be printed. Author ------ Written by Linus Torvalds . -Junio C Hamano and Pierre Habouzit +Junio C Hamano and Pierre Habouzit Documentation -------------- diff --git a/git-revert.html b/git-revert.html index adf975072..1c1588c59 100644 --- a/git-revert.html +++ b/git-revert.html @@ -413,7 +413,7 @@ effect to your index in a row.

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -425,7 +425,7 @@ effect to your index in a row.

    diff --git a/git-revert.txt b/git-revert.txt index 271850f51..98cfa3c0d 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -61,7 +61,7 @@ effect to your index in a row. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-show-branch.html b/git-show-branch.html index d34d82fdd..3ecad5f35 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -563,7 +563,7 @@ topologically related with each other.

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -575,7 +575,7 @@ topologically related with each other.

    diff --git a/git-show-branch.txt b/git-show-branch.txt index 14e10362b..d3f258869 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -182,7 +182,7 @@ topologically related with each other. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation diff --git a/git-show.html b/git-show.html index 289e08937..fc6d5d73a 100644 --- a/git-show.html +++ b/git-show.html @@ -837,7 +837,7 @@ reversible operation.

    Author

    Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net>. Significantly enhanced by +Junio C Hamano <gitster@pobox.com>. Significantly enhanced by Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    Documentation

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

    diff --git a/git-show.txt b/git-show.txt index e0b52bcb3..1642cfd82 100644 --- a/git-show.txt +++ b/git-show.txt @@ -71,7 +71,7 @@ include::i18n.txt[] Author ------ Written by Linus Torvalds and -Junio C Hamano . Significantly enhanced by +Junio C Hamano . Significantly enhanced by Johannes Schindelin . diff --git a/git-status.html b/git-status.html index ecbed675c..c426796fd 100644 --- a/git-status.html +++ b/git-status.html @@ -368,7 +368,7 @@ option of git-submodule(1)).

    Author

    Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net>.

    +Junio C Hamano <gitster@pobox.com>.

    Documentation

    @@ -380,7 +380,7 @@ Junio C Hamano <junkio@cox.net>.

    diff --git a/git-status.txt b/git-status.txt index 57b749823..84f60f340 100644 --- a/git-status.txt +++ b/git-status.txt @@ -64,7 +64,7 @@ linkgit:gitignore[5] Author ------ Written by Linus Torvalds and -Junio C Hamano . +Junio C Hamano . Documentation -------------- diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index d6a740880..d6be001de 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -379,7 +379,7 @@ name is not a symbolic ref, or 128 if another error occurs.

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    GIT

    @@ -387,7 +387,7 @@ name is not a symbolic ref, or 128 if another error occurs.

    diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index 6266e6f65..210fde03a 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt @@ -55,7 +55,7 @@ name is not a symbolic ref, or 128 if another error occurs. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano GIT --- diff --git a/git-tag.html b/git-tag.html index da821292b..0603ecf5b 100644 --- a/git-tag.html +++ b/git-tag.html @@ -588,7 +588,7 @@ is "YYYY-MM-DD HH:MM".

    Author

    Written by Linus Torvalds <torvalds@osdl.org>, -Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.

    +Junio C Hamano <gitster@pobox.com> and Chris Wright <chrisw@osdl.org>.

    Documentation

    @@ -600,7 +600,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.<
    diff --git a/git-tag.txt b/git-tag.txt index b605e6caa..b8dc88fa3 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -247,7 +247,7 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1 Author ------ Written by Linus Torvalds , -Junio C Hamano and Chris Wright . +Junio C Hamano and Chris Wright . Documentation -------------- diff --git a/git-update-server-info.html b/git-update-server-info.html index d46bff6f1..bb35ce596 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -3,7 +3,7 @@ - + git-update-server-info(1) @@ -272,19 +320,19 @@ git-update-server-info(1) Manual Page

    SYNOPSIS

    -

    git update-server-info [--force]

    +

    git update-server-info [--force]

    -

    DESCRIPTION

    +

    DESCRIPTION

    -

    A dumb server that does not do on-the-fly pack generations must +

    A dumb server that does not do on-the-fly pack generations must have some auxiliary information files in $GIT_DIR/info and $GIT_OBJECT_DIRECTORY/info directories to help clients discover what references and packs the server has. This command -generates such auxiliary files.

    +generates such auxiliary files.

    -

    OPTIONS

    +

    OPTIONS

    -
    +
    -f
    @@ -296,14 +344,14 @@ generates such auxiliary files.

    Update the info files from scratch.

    -
    +
    -

    OUTPUT

    +

    OUTPUT

    -

    Currently the command updates the following files. Please see +

    Currently the command updates the following files. Please see gitrepository-layout(5) for description of -what they are for:

    -
      +what they are for:

    +

    • objects/info/packs @@ -314,28 +362,28 @@ objects/info/packs info/refs

      • -
    +
    -

    BUGS

    +

    BUGS

    -

    When you remove an existing ref, the command fails to update -info/refs file unless --force flag is given.

    +

    When you remove an existing ref, the command fails to update +info/refs file unless --force flag is given.

    -

    Author

    +

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    -

    Documentation

    +

    Documentation

    -

    Documentation by Junio C Hamano.

    +

    Documentation by Junio C Hamano.

    -

    GIT

    +

    GIT

    -

    Part of the git(1) suite

    +

    Part of the git(1) suite

    diff --git a/git-update-server-info.txt b/git-update-server-info.txt index bc1207a31..35d27b0c7 100644 --- a/git-update-server-info.txt +++ b/git-update-server-info.txt @@ -47,7 +47,7 @@ info/refs file unless `--force` flag is given. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-verify-pack.html b/git-verify-pack.html index df25b0fee..9ff98d0d4 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -374,7 +374,7 @@ corresponding pack file.

    Author

    -

    Written by Junio C Hamano <junkio@cox.net>

    +

    Written by Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -386,7 +386,7 @@ corresponding pack file.

    diff --git a/git-verify-pack.txt b/git-verify-pack.txt index 53a9ce308..c8611632d 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt @@ -42,7 +42,7 @@ for objects that are deltified. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- diff --git a/git-whatchanged.html b/git-whatchanged.html index 35b1eb658..3f845e720 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -777,7 +777,7 @@ git whatchanged --since="2 weeks ago" -- gitk

    Author

    Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net>

    +Junio C Hamano <gitster@pobox.com>

    Documentation

    @@ -789,7 +789,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-whatchanged.txt b/git-whatchanged.txt index d7fad1532..cadfbd904 100644 --- a/git-whatchanged.txt +++ b/git-whatchanged.txt @@ -67,7 +67,7 @@ git whatchanged --since="2 weeks ago" \-- gitk:: Author ------ Written by Linus Torvalds and -Junio C Hamano +Junio C Hamano Documentation diff --git a/howto-index.html b/howto-index.html index 8eedd2671..62106cba5 100644 --- a/howto-index.html +++ b/howto-index.html @@ -3,7 +3,7 @@ - + GIT Howto Index @@ -263,79 +311,79 @@ div.exampleblock-content {
    -

    Here is a collection of mailing list postings made by various -people describing how they use git in their workflow.

    -
      +

      Here is a collection of mailing list postings made by various +people describing how they use git in their workflow.

      +
      -

      Imagine that git development is racing along as usual, when our friendly +

    +

    Imagine that git development is racing along as usual, when our friendly neighborhood maintainer is struck down by a wayward bus. Out of the hordes of suckers (loyal developers), you have been tricked (chosen) to -step up as the new maintainer. This howto will show you "how to" do it.

    -
      +step up as the new maintainer. This howto will show you "how to" do it.

    +
    -

    In this article, Linus demonstrates how a broken commit +

    +

    In this article, Linus demonstrates how a broken commit in a sequence of commits can be removed by rewinding the head and -reapplying selected changes.

    -
      +reapplying selected changes.

    +
    -

    In this article, JC talks about how he rebases the +

    +

    In this article, JC talks about how he rebases the public "pu" branch using the core GIT tools when he updates the "master" branch, and how "rebase" works. Also discussed is how this applies to individual developers who sends patches -upstream.

    -
      +upstream.

    +
    -

    In this how-to article, JC talks about how he +

    +

    In this how-to article, JC talks about how he uses the post-update hook to automate git documentation page -shown at http://www.kernel.org/pub/software/scm/git/docs/.

    -
      +shown at http://www.kernel.org/pub/software/scm/git/docs/.

    +
    -

    Some tricks to reconstruct blob objects in order to fix -a corrupted repository.

    -
      +
    +

    Some tricks to reconstruct blob objects in order to fix +a corrupted repository.

    +
    -

    In this article, JC gives a small real-life example of using +

    +

    In this article, JC gives a small real-life example of using git revert command, and using a temporary branch and tag for safety -and easier sanity checking.

    -
      +and easier sanity checking.

    +
    -

    In this article, JC describes how to separate topic branches.

    -
      +
    +

    In this article, JC describes how to separate topic branches.

    +
    -

    An example hooks/update script is presented to +

    +

    An example hooks/update script is presented to implement repository maintenance policies, such as who can push -into which branch and who can make a tag.

    -
      +into which branch and who can make a tag.

    +
    -

    In this article, Sean demonstrates how one can use the subtree merge -strategy.

    +
    +

    In this article, Sean demonstrates how one can use the subtree merge +strategy.

    diff --git a/howto-index.txt b/howto-index.txt index 20ce40ba6..949105dc8 100644 --- a/howto-index.txt +++ b/howto-index.txt @@ -19,7 +19,7 @@ in a sequence of commits can be removed by rewinding the head and reapplying selected changes. -* link:howto/rebase-from-internal-branch.txt[rebase-from-internal-branch] by Junio C Hamano +* link:howto/rebase-from-internal-branch.txt[rebase-from-internal-branch] by Junio C Hamano In this article, JC talks about how he rebases the public "pu" branch using the core GIT tools when he updates @@ -28,7 +28,7 @@ is how this applies to individual developers who sends patches upstream. -* link:howto/rebuild-from-update-hook.txt[rebuild-from-update-hook] by Junio C Hamano +* link:howto/rebuild-from-update-hook.txt[rebuild-from-update-hook] by Junio C Hamano In this how-to article, JC talks about how he uses the post-update hook to automate git documentation page @@ -41,14 +41,14 @@ Some tricks to reconstruct blob objects in order to fix a corrupted repository. -* link:howto/revert-branch-rebase.html[revert-branch-rebase] by Junio C Hamano +* link:howto/revert-branch-rebase.html[revert-branch-rebase] by Junio C Hamano In this article, JC gives a small real-life example of using 'git revert' command, and using a temporary branch and tag for safety and easier sanity checking. -* link:howto/separating-topic-branches.txt[separating-topic-branches] by Junio C Hamano +* link:howto/separating-topic-branches.txt[separating-topic-branches] by Junio C Hamano In this article, JC describes how to separate topic branches. @@ -57,7 +57,7 @@ In this article, JC describes how to separate topic branches. -* link:howto/update-hook-example.txt[update-hook-example] by Junio C Hamano and Carl Baldwin +* link:howto/update-hook-example.txt[update-hook-example] by Junio C Hamano and Carl Baldwin An example hooks/update script is presented to implement repository maintenance policies, such as who can push diff --git a/howto/rebase-from-internal-branch.txt b/howto/rebase-from-internal-branch.txt index 7a76045eb..d214d4bf9 100644 --- a/howto/rebase-from-internal-branch.txt +++ b/howto/rebase-from-internal-branch.txt @@ -1,4 +1,4 @@ -From: Junio C Hamano +From: Junio C Hamano To: git@vger.kernel.org Cc: Petr Baudis , Linus Torvalds Subject: Re: sending changesets from the middle of a git tree diff --git a/howto/rebuild-from-update-hook.txt b/howto/rebuild-from-update-hook.txt index 8d55dfbfa..48c67568d 100644 --- a/howto/rebuild-from-update-hook.txt +++ b/howto/rebuild-from-update-hook.txt @@ -1,6 +1,6 @@ Subject: [HOWTO] Using post-update hook Message-ID: <7vy86o6usx.fsf@assigned-by-dhcp.cox.net> -From: Junio C Hamano +From: Junio C Hamano Date: Fri, 26 Aug 2005 18:19:10 -0700 Abstract: In this how-to article, JC talks about how he uses the post-update hook to automate git documentation page diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 3f9d89538..7d1ad8b48 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -3,7 +3,7 @@ - + Reverting an existing commit @@ -263,22 +311,22 @@ div.exampleblock-content {
    -

    One of the changes I pulled into the master branch turns out to +

    One of the changes I pulled into the master branch turns out to break building GIT with GCC 2.95. While they were well intentioned portability fixes, keeping things working with gcc-2.95 was also important. Here is what I did to revert the change in the master branch and to adjust the pu branch, using core GIT tools and -barebone Porcelain.

    -

    First, prepare a throw-away branch in case I screw things up.

    +barebone Porcelain.

    +

    First, prepare a throw-away branch in case I screw things up.

    $ git checkout -b revert-c99 master
    -

    Now I am on the revert-c99 branch. Let's figure out which commit to +

    Now I am on the revert-c99 branch. Let's figure out which commit to revert. I happen to know that the top of the master branch is a merge, and its second parent (i.e. foreign commit I merged from) has the change I would want to undo. Further I happen to know that that -merge introduced 5 commits or so:

    +merge introduced 5 commits or so:

    $ git show-branch --more=4 master master^2 | head
@@ -293,18 +341,18 @@ merge introduced 5 commits or so:
    
 *+ [master^2~4] Replace zero-length array decls with [].
 *  [master~1] tutorial note about git branch
    -

    The —more=4 above means "after we reach the merge base of refs, +

    The —more=4 above means "after we reach the merge base of refs, show until we display four more common commits". That last commit would have been where the "portable" branch was forked from the main git.git repository, so this would show everything on both branches since then. I just limited the output to the first handful using -head.

    -

    Now I know master^2~4 (pronounce it as "find the second parent of +head.

    +

    Now I know master^2~4 (pronounce it as "find the second parent of the master, and then go four generations back following the first parent") is the one I would want to revert. Since I also want to say why I am reverting it, the -n flag is given to git revert. This prevents it from actually making a commit, and instead git revert -leaves the commit log message it wanted to use in .msg file:

    +leaves the commit log message it wanted to use in .msg file:

    $ git revert -n master^2~4
@@ -316,18 +364,18 @@ $ git diff HEAD ;# to make sure what we are reverting makes sense.
 $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.
 $ make clean test ;# make sure it did not cause other breakage.
    -

    The reverted change makes sense (from reading the diff output), does +

    The reverted change makes sense (from reading the diff output), does fix the problem (from make CC=gcc-2.95 test), and does not cause new -breakage (from the last make test). I'm ready to commit:

    +breakage (from the last make test). I'm ready to commit:

    $ git commit -a -s ;# read .msg into the log,
                     # and explain why I am reverting.
    -

    I could have screwed up in any of the above steps, but in the worst +

    I could have screwed up in any of the above steps, but in the worst case I could just have done git checkout master to start over. Fortunately I did not have to; what I have in the current branch -revert-c99 is what I want. So merge that back into master:

    +revert-c99 is what I want. So merge that back into master:

    $ git checkout master
@@ -340,14 +388,14 @@ Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
  server-info.c  |    2 +-
  5 files changed, 8 insertions(+), 8 deletions(-)
    -

    There is no need to redo the test at this point. We fast forwarded -and we know master matches revert-c99 exactly. In fact:

    +

    There is no need to redo the test at this point. We fast forwarded +and we know master matches revert-c99 exactly. In fact:

    $ git diff master..revert-c99
    -

    says nothing.

    -

    Then we rebase the pu branch as usual.

    +

    says nothing.

    +

    Then we rebase the pu branch as usual.

    $ git checkout pu
@@ -375,24 +423,24 @@ Finished one cherry-pick.
 First trying simple merge strategy to cherry-pick.
 Finished one cherry-pick.
    -

    The temporary tag pu-anchor is me just being careful, in case git -rebase screws up. After this, I can do these for sanity check:

    +

    The temporary tag pu-anchor is me just being careful, in case git +rebase screws up. After this, I can do these for sanity check:

    $ git diff pu-anchor..pu ;# make sure we got the master fix.
 $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.
 $ make clean test ;# make sure it did not cause other breakage.
    -

    Everything is in the good order. I do not need the temporary branch -nor tag anymore, so remove them:

    +

    Everything is in the good order. I do not need the temporary branch +nor tag anymore, so remove them:

    $ rm -f .git/refs/tags/pu-anchor
 $ git branch -d revert-c99
    -

    It was an emergency fix, so we might as well merge it into the +

    It was an emergency fix, so we might as well merge it into the release candidate branch, although I expect the next release would -be some days off:

    +be some days off:

    $ git checkout rc
@@ -410,7 +458,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
  server-info.c  |    2 +-
  5 files changed, 8 insertions(+), 8 deletions(-)
    -

    And the final repository status looks like this:

    +

    And the final repository status looks like this:

    $ git show-branch --more=1 master pu rc
@@ -434,7 +482,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
    diff --git a/howto/revert-branch-rebase.txt b/howto/revert-branch-rebase.txt index 865a66632..e70d8a31e 100644 --- a/howto/revert-branch-rebase.txt +++ b/howto/revert-branch-rebase.txt @@ -1,4 +1,4 @@ -From: Junio C Hamano +From: Junio C Hamano To: git@vger.kernel.org Subject: [HOWTO] Reverting an existing commit Abstract: In this article, JC gives a small real-life example of using diff --git a/howto/separating-topic-branches.txt b/howto/separating-topic-branches.txt index 0d73b3122..6d3eb8ed0 100644 --- a/howto/separating-topic-branches.txt +++ b/howto/separating-topic-branches.txt @@ -1,4 +1,4 @@ -From: Junio C Hamano +From: Junio C Hamano Subject: Separating topic branches Abstract: In this article, JC describes how to separate topic branches. diff --git a/howto/update-hook-example.txt b/howto/update-hook-example.txt index 8b2ec502f..697d91888 100644 --- a/howto/update-hook-example.txt +++ b/howto/update-hook-example.txt @@ -1,4 +1,4 @@ -From: Junio C Hamano and Carl Baldwin +From: Junio C Hamano and Carl Baldwin Subject: control access to branches. Date: Thu, 17 Nov 2005 23:55:32 -0800 Message-ID: <7vfypumlu3.fsf@assigned-by-dhcp.cox.net> diff --git a/technical/api-index.html b/technical/api-index.html index 908710886..19171bb33 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -3,7 +3,7 @@ - + GIT API Documents @@ -263,9 +311,9 @@ div.exampleblock-content {
    -

    GIT has grown a set of internal API over time. This collection -documents them.

    -
    +

    2007-11-24

    diff --git a/technical/api-index.txt b/technical/api-index.txt index 4a1190de6..619d4447b 100644 --- a/technical/api-index.txt +++ b/technical/api-index.txt @@ -20,13 +20,13 @@ documents them. * link:api-lockfile.html[lockfile API] * link:api-object-access.html[object access API] * link:api-parse-options.html[parse-options API] -* link:api-path-list.html[path-list API] * link:api-quote.html[quote API] * link:api-remote.html[Remotes configuration API] * link:api-revision-walking.html[revision walking API] * link:api-run-command.html[run-command API] * link:api-setup.html[setup API] * link:api-strbuf.html[strbuf API] +* link:api-string-list.html[string-list API] * link:api-tree-walking.html[tree walking API] * link:api-xdiff-interface.html[xdiff interface API] //////////////////////////////////////////////////////////////// diff --git a/technical/api-path-list.txt b/technical/api-path-list.txt deleted file mode 100644 index 9dbedd0a6..000000000 --- a/technical/api-path-list.txt +++ /dev/null @@ -1,126 +0,0 @@ -path-list API -============= - -The path_list API offers a data structure and functions to handle sorted -and unsorted string lists. - -The name is a bit misleading, a path_list may store not only paths but -strings in general. - -The caller: - -. Allocates and clears a `struct path_list` variable. - -. Initializes the members. You might want to set the flag `strdup_paths` - if the strings should be strdup()ed. For example, this is necessary - when you add something like git_path("..."), since that function returns - a static buffer that will change with the next call to git_path(). -+ -If you need something advanced, you can manually malloc() the `items` -member (you need this if you add things later) and you should set the -`nr` and `alloc` members in that case, too. - -. Adds new items to the list, using `path_list_append` or `path_list_insert`. - -. Can check if a string is in the list using `path_list_has_path` or - `unsorted_path_list_has_path` and get it from the list using - `path_list_lookup` for sorted lists. - -. Can sort an unsorted list using `sort_path_list`. - -. Finally it should free the list using `path_list_clear`. - -Example: - ----- -struct path_list list; -int i; - -memset(&list, 0, sizeof(struct path_list)); -path_list_append("foo", &list); -path_list_append("bar", &list); -for (i = 0; i < list.nr; i++) - printf("%s\n", list.items[i].path) ----- - -NOTE: It is more efficient to build an unsorted list and sort it -afterwards, instead of building a sorted list (`O(n log n)` instead of -`O(n^2)`). -+ -However, if you use the list to check if a certain string was added -already, you should not do that (using unsorted_path_list_has_path()), -because the complexity would be quadratic again (but with a worse factor). - -Functions ---------- - -* General ones (works with sorted and unsorted lists as well) - -`print_path_list`:: - - Dump a path_list to stdout, useful mainly for debugging purposes. It - can take an optional header argument and it writes out the - string-pointer pairs of the path_list, each one in its own line. - -`path_list_clear`:: - - Free a path_list. The `path` pointer of the items will be freed in case - the `strdup_paths` member of the path_list is set. The second parameter - controls if the `util` pointer of the items should be freed or not. - -* Functions for sorted lists only - -`path_list_has_path`:: - - Determine if the path_list has a given string or not. - -`path_list_insert`:: - - Insert a new element to the path_list. The returned pointer can be handy - if you want to write something to the `util` pointer of the - path_list_item containing the just added string. -+ -Since this function uses xrealloc() (which die()s if it fails) if the -list needs to grow, it is safe not to check the pointer. I.e. you may -write `path_list_insert(...)->util = ...;`. - -`path_list_lookup`:: - - Look up a given string in the path_list, returning the containing - path_list_item. If the string is not found, NULL is returned. - -* Functions for unsorted lists only - -`path_list_append`:: - - Append a new string to the end of the path_list. - -`sort_path_list`:: - - Make an unsorted list sorted. - -`unsorted_path_list_has_path`:: - - It's like `path_list_has_path()` but for unsorted lists. -+ -This function needs to look through all items, as opposed to its -counterpart for sorted lists, which performs a binary search. - -Data structures ---------------- - -* `struct path_list_item` - -Represents an item of the list. The `path` member is a pointer to the -string, and you may use the `util` member for any purpose, if you want. - -* `struct path_list` - -Represents the list itself. - -. The array of items are available via the `items` member. -. The `nr` member contains the number of items stored in the list. -. The `alloc` member is used to avoid reallocating at every insertion. - You should not tamper with it. -. Setting the `strdup_paths` member to 1 will strdup() the strings - before adding them, see above. diff --git a/technical/api-string-list.html b/technical/api-string-list.html new file mode 100644 index 000000000..7095ff7a2 --- /dev/null +++ b/technical/api-string-list.html @@ -0,0 +1,541 @@ + + + + + + +string-list API + + + +
    +
    +

    The string_list API offers a data structure and functions to handle sorted +and unsorted string lists.

    +

    The string_list struct used to be called path_list, but was renamed +because it is not specific to paths.

    +

    The caller:

    +
      +
    1. +

      +Allocates and clears a struct string_list variable. +

      +
      2. +
    2. +

      +Initializes the members. You might want to set the flag strdup_strings + if the strings should be strdup()ed. For example, this is necessary + when you add something like git_path("…"), since that function returns + a static buffer that will change with the next call to git_path(). +

      +

      If you need something advanced, you can manually malloc() the items +member (you need this if you add things later) and you should set the +nr and alloc members in that case, too.

      +
      3. +
    3. +

      +Adds new items to the list, using string_list_append or + string_list_insert. +

      +
      4. +
    4. +

      +Can check if a string is in the list using string_list_has_string or + unsorted_string_list_has_string and get it from the list using + string_list_lookup for sorted lists. +

      +
      5. +
    5. +

      +Can sort an unsorted list using sort_string_list. +

      +
      6. +
    6. +

      +Finally it should free the list using string_list_clear. +

      +
      7. +
    +

    Example:

    +
    +
    +
    struct string_list list;
+int i;
+
+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)
    +
    +
    + + + +
    +
    Note
    +    		It is more efficient to build an unsorted list and sort it +afterwards, instead of building a sorted list (O(n log n) instead of +O(n^2)).
    +
    +

    + +However, if you use the list to check if a certain string was added +already, you should not do that (using unsorted_string_list_has_string()), +because the complexity would be quadratic again (but with a worse factor).

    +
    +
    +

    Functions

    +
    +
      +
    • +

      +General ones (works with sorted and unsorted lists as well) +

      +
      +
      +print_string_list +
      +
      +

      + Dump a string_list to stdout, useful mainly for debugging purposes. It + can take an optional header argument and it writes out the + string-pointer pairs of the string_list, each one in its own line. +

      +
      +
      +string_list_clear +
      +
      +

      + Free a string_list. The string pointer of the items will be freed in + case the strdup_strings member of the string_list is set. The second + parameter controls if the util pointer of the items should be freed + or not. +

      +
      +
      +
      • +
    • +

      +Functions for sorted lists only +

      +
      +
      +string_list_has_string +
      +
      +

      + Determine if the string_list has a given string or not. +

      +
      +
      +string_list_insert +
      +
      +

      + Insert a new element to the string_list. The returned pointer can be + handy if you want to write something to the util pointer of the + string_list_item containing the just added string. +

      +

      Since this function uses xrealloc() (which die()s if it fails) if the +list needs to grow, it is safe not to check the pointer. I.e. you may +write string_list_insert(…)->util = …;.

      +
      +
      +string_list_lookup +
      +
      +

      + Look up a given string in the string_list, returning the containing + string_list_item. If the string is not found, NULL is returned. +

      +
      +
      +
      • +
    • +

      +Functions for unsorted lists only +

      +
      +
      +string_list_append +
      +
      +

      + Append a new string to the end of the string_list. +

      +
      +
      +sort_string_list +
      +
      +

      + Make an unsorted list sorted. +

      +
      +
      +unsorted_string_list_has_string +
      +
      +

      + It's like string_list_has_string() but for unsorted lists. +

      +

      This function needs to look through all items, as opposed to its +counterpart for sorted lists, which performs a binary search.

      +
      +
      +
      • +
    +
    +

    Data structures

    +
    +
      +
    • +

      +struct string_list_item +

      +
      • +
    +

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

    +
      +
    • +

      +struct string_list +

      +
      • +
    +

    Represents the list itself.

    +
      +
    1. +

      +The array of items are available via the items member. +

      +
      2. +
    2. +

      +The nr member contains the number of items stored in the list. +

      +
      3. +
    3. +

      +The alloc member is used to avoid reallocating at every insertion. + You should not tamper with it. +

      +
      4. +
    4. +

      +Setting the strdup_strings member to 1 will strdup() the strings + before adding them, see above. +

      +
      5. +
    +
    + + + diff --git a/technical/api-string-list.txt b/technical/api-string-list.txt new file mode 100644 index 000000000..92b3ecdae --- /dev/null +++ b/technical/api-string-list.txt @@ -0,0 +1,128 @@ +string-list API +=============== + +The string_list API offers a data structure and functions to handle sorted +and unsorted string lists. + +The 'string_list' struct used to be called 'path_list', but was renamed +because it is not specific to paths. + +The caller: + +. Allocates and clears a `struct string_list` variable. + +. Initializes the members. You might want to set the flag `strdup_strings` + if the strings should be strdup()ed. For example, this is necessary + when you add something like git_path("..."), since that function returns + a static buffer that will change with the next call to git_path(). ++ +If you need something advanced, you can manually malloc() the `items` +member (you need this if you add things later) and you should set the +`nr` and `alloc` members in that case, too. + +. Adds new items to the list, using `string_list_append` or + `string_list_insert`. + +. Can check if a string is in the list using `string_list_has_string` or + `unsorted_string_list_has_string` and get it from the list using + `string_list_lookup` for sorted lists. + +. Can sort an unsorted list using `sort_string_list`. + +. Finally it should free the list using `string_list_clear`. + +Example: + +---- +struct string_list list; +int i; + +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) +---- + +NOTE: It is more efficient to build an unsorted list and sort it +afterwards, instead of building a sorted list (`O(n log n)` instead of +`O(n^2)`). ++ +However, if you use the list to check if a certain string was added +already, you should not do that (using unsorted_string_list_has_string()), +because the complexity would be quadratic again (but with a worse factor). + +Functions +--------- + +* General ones (works with sorted and unsorted lists as well) + +`print_string_list`:: + + Dump a string_list to stdout, useful mainly for debugging purposes. It + can take an optional header argument and it writes out the + string-pointer pairs of the string_list, each one in its own line. + +`string_list_clear`:: + + Free a string_list. The `string` pointer of the items will be freed in + case the `strdup_strings` member of the string_list is set. The second + parameter controls if the `util` pointer of the items should be freed + or not. + +* Functions for sorted lists only + +`string_list_has_string`:: + + Determine if the string_list has a given string or not. + +`string_list_insert`:: + + Insert a new element to the string_list. The returned pointer can be + handy if you want to write something to the `util` pointer of the + string_list_item containing the just added string. ++ +Since this function uses xrealloc() (which die()s if it fails) if the +list needs to grow, it is safe not to check the pointer. I.e. you may +write `string_list_insert(...)->util = ...;`. + +`string_list_lookup`:: + + Look up a given string in the string_list, returning the containing + string_list_item. If the string is not found, NULL is returned. + +* Functions for unsorted lists only + +`string_list_append`:: + + Append a new string to the end of the string_list. + +`sort_string_list`:: + + Make an unsorted list sorted. + +`unsorted_string_list_has_string`:: + + It's like `string_list_has_string()` but for unsorted lists. ++ +This function needs to look through all items, as opposed to its +counterpart for sorted lists, which performs a binary search. + +Data structures +--------------- + +* `struct string_list_item` + +Represents an item of the list. The `path` member is a pointer to the +string, and you may use the `util` member for any purpose, if you want. + +* `struct string_list` + +Represents the list itself. + +. The array of items are available via the `items` member. +. The `nr` member contains the number of items stored in the list. +. The `alloc` member is used to avoid reallocating at every insertion. + You should not tamper with it. +. Setting the `strdup_strings` member to 1 will strdup() the strings + before adding them, see above. diff --git a/user-manual.html b/user-manual.html index 3be7ee71b..a2339f789 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,4 +1,4 @@ -Git User's Manual (for version 1.5.3 or newer)

    Git User's Manual (for version 1.5.3 or newer)

    Table of Contents

    Preface
    1. Repositories and Branches
    How to get a git repository
    How to check out a different version of a project
    Understanding History: Commits
    Understanding history: commits, parents, and reachability
    Understanding history: History diagrams
    Understanding history: What is a branch?
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git-fetch
    Fetching branches from other repositories
    2. Exploring git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Counting the number of commits on a branch
    Check whether two branches point at the same history
    Find first tagged version including a given fix
    Showing commits unique to a given branch
    Creating a changelog and tarball for a software release
    Finding commits referencing a file with given content
    3. Developing with git
    Telling git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Getting conflict-resolution help during a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Fixing a mistake with a new commit
    Fixing a mistake by rewriting history
    Checking out an old version of a file
    Temporarily setting aside work in progress
    Ensuring good performance
    Ensuring reliability
    Checking the repository for corruption
    Recovering lost changes
    4. Sharing development with others
    Getting updates with git-pull
    Submitting patches to a project
    Importing patches to a project
    Public git repositories
    Setting up a public repository
    Exporting a git repository via the git protocol
    Exporting a git repository via http
    Pushing changes to a public repository
    What to do when a push fails
    Setting up a shared repository
    Allowing web browsing of a repository
    Examples
    Maintaining topic branches for a Linux subsystem maintainer
    5. Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git-rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    6. Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git-fetch to do non-fast-forward updates
    Configuring remote branches
    7. Git concepts
    The Object Database
    Commit Object
    Tree Object
    Blob Object
    Trust
    Tag Object
    How git stores objects efficiently: pack files
    Dangling objects
    Recovering from repository corruption
    The index
    8. Submodules
    Pitfalls with submodules
    9. Low-level git operations
    Object access and manipulation
    The Workflow
    working directory -> index
    index -> object database
    object database -> index
    index -> working directory
    Tying it all together
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    10. Hacking git
    Object storage format
    A birds-eye view of Git's source code
    11. GIT Glossary
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual

    Preface

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX +Git User's Manual (for version 1.5.3 or newer)

    Git User's Manual (for version 1.5.3 or newer)

    Table of Contents

    Preface
    1. Repositories and Branches
    How to get a git repository
    How to check out a different version of a project
    Understanding History: Commits
    Understanding history: commits, parents, and reachability
    Understanding history: History diagrams
    Understanding history: What is a branch?
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git-fetch
    Fetching branches from other repositories
    2. Exploring git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Counting the number of commits on a branch
    Check whether two branches point at the same history
    Find first tagged version including a given fix
    Showing commits unique to a given branch
    Creating a changelog and tarball for a software release
    Finding commits referencing a file with given content
    3. Developing with git
    Telling git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Getting conflict-resolution help during a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Fixing a mistake with a new commit
    Fixing a mistake by rewriting history
    Checking out an old version of a file
    Temporarily setting aside work in progress
    Ensuring good performance
    Ensuring reliability
    Checking the repository for corruption
    Recovering lost changes
    4. Sharing development with others
    Getting updates with git-pull
    Submitting patches to a project
    Importing patches to a project
    Public git repositories
    Setting up a public repository
    Exporting a git repository via the git protocol
    Exporting a git repository via http
    Pushing changes to a public repository
    What to do when a push fails
    Setting up a shared repository
    Allowing web browsing of a repository
    Examples
    Maintaining topic branches for a Linux subsystem maintainer
    5. Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git-rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    6. Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git-fetch to do non-fast-forward updates
    Configuring remote branches
    7. Git concepts
    The Object Database
    Commit Object
    Tree Object
    Blob Object
    Trust
    Tag Object
    How git stores objects efficiently: pack files
    Dangling objects
    Recovering from repository corruption
    The index
    8. Submodules
    Pitfalls with submodules
    9. Low-level git operations
    Object access and manipulation
    The Workflow
    working directory -> index
    index -> object database
    object database -> index
    index -> working directory
    Tying it all together
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    10. Hacking git
    Object storage format
    A birds-eye view of Git's source code
    11. GIT Glossary
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual

    Preface

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of git.

    Chapter 1, Repositories and Branches and Chapter 2, Exploring git history explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for @@ -1001,7 +1001,7 @@ the result would create a new merge commit, like this:

    git-rebase(1):
    $ git checkout mywork
    
 $ git rebase origin
    This will remove each of your commits from mywork, temporarily saving
-them as patches (in a directory named ".git/rebase"), update mywork to
+them as patches (in a directory named ".git/rebase-apply"), update mywork to
 point at the latest version of origin, then apply each of the saved
 patches to the new mywork.  The result will look like:
     o--o--O--o--o--o <-- origin
                  \
diff --git a/user-manual.txt b/user-manual.txt
index 8761ee7e7..c5641af19 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -2431,7 +2431,7 @@ $ git rebase origin
 -------------------------------------------------
 
 This will remove each of your commits from mywork, temporarily saving
-them as patches (in a directory named ".git/rebase"), update mywork to
+them as patches (in a directory named ".git/rebase-apply"), update mywork to
 point at the latest version of origin, then apply each of the saved
 patches to the new mywork.  The result will look like:
 
-- 
2.26.2