From 7d9e9bd46558c53fc42faa2a97ad490c0b1580cd Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 29 Aug 2007 07:31:47 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc7 --- RelNotes-1.5.3.txt | 18 ++++++++++++++--- git-add.html | 8 ++++---- git-add.txt | 6 +++--- git-diff.html | 13 ++++++------ git-diff.txt | 11 ++++++----- git-format-patch.html | 46 +++++++++++++++++++++++++++++++++++-------- git-format-patch.txt | 32 +++++++++++++++++++++++------- git-log.html | 4 ++-- git-log.txt | 2 +- git-svn.html | 4 ++-- git-svn.txt | 2 +- user-manual.html | 2 +- user-manual.txt | 2 +- 13 files changed, 106 insertions(+), 44 deletions(-) diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt index 8859125ab..f2efaaffb 100644 --- a/RelNotes-1.5.3.txt +++ b/RelNotes-1.5.3.txt @@ -175,6 +175,15 @@ Updates since v1.5.2 - "git log" learned --log-size to show the number of bytes in the log message part of the output to help qgit. + - "git log --name-status" does not require you to give "-r" anymore. + As a general rule, Porcelain commands should recurse when showing + diff. + + - "git format-patch --root A" can be used to format everything + since the beginning up to A. This was supported with + "git format-patch --root A A" for a long time, but was not + properly documented. + - "git svn dcommit" retains local merge information. - "git svnimport" allows an empty string to be specified as the @@ -304,8 +313,8 @@ Updates since v1.5.2 when switching branches that have differences in only a handful paths. - - "git commit paths..." has also been optimized. - + - "git add paths..." and "git commit paths..." has also been + heavily optimized. Fixes since v1.5.2 ------------------ @@ -321,8 +330,11 @@ this release, unless otherwise noted. - "git-write-tree" had a bad interaction with racy-git avoidance and gitattributes mechanisms. + - "git --bare command" overrode existing GIT_DIR setting and always + made it treat the current working directory as GIT_DIR. + -- exec >/var/tmp/1 -O=v1.5.3-rc6-47-ge92ea62 +O=v1.5.3-rc7 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-add.html b/git-add.html index 211ea135f..8b9d24f24 100644 --- a/git-add.html +++ b/git-add.html @@ -294,9 +294,9 @@ files have changes that are staged for the next commit.

The git add command will not add ignored files by default. If any ignored files were explicitly specified on the command line, git add will fail with a list of ignored files. Ignored files reached by -directory recursion or filename globbing will be silently ignored. -The add command can be used to add ignored files with the -f -(force) option.

+directory recursion or filename globbing performed by Git (quote your +globs before the shell) will be silently ignored. The add command can +be used to add ignored files with the -f (force) option.

Please see git-commit(1) for alternative ways to add content to a commit.

@@ -570,7 +570,7 @@ diff diff --git a/git-add.txt b/git-add.txt index e5efbc9a4..2fe735555 100644 --- a/git-add.txt +++ b/git-add.txt @@ -33,9 +33,9 @@ files have changes that are staged for the next commit. The 'git add' command will not add ignored files by default. If any ignored files were explicitly specified on the command line, 'git add' will fail with a list of ignored files. Ignored files reached by -directory recursion or filename globbing will be silently ignored. -The 'add' command can be used to add ignored files with the `-f` -(force) option. +directory recursion or filename globbing performed by Git (quote your +globs before the shell) will be silently ignored. The 'add' command can +be used to add ignored files with the `-f` (force) option. Please see gitlink:git-commit[1] for alternative ways to add content to a commit. diff --git a/git-diff.html b/git-diff.html index 5bf957608..577fc0b1d 100644 --- a/git-diff.html +++ b/git-diff.html @@ -337,26 +337,27 @@ forced by --no-index.

-git-diff [--options] <commit>…<commit> [--] [<path>…] +git-diff [--options] <commit>...<commit> [--] [<path>…]

This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor - of both <commit>. "git-diff A…B" is equivalent to + of both <commit>. "git-diff A...B" is equivalent to "git-diff $(git-merge-base A B) B". You can omit any one of <commit>, which has the same effect as using HEAD instead.

Just in case if you are doing something exotic, it should be -noted that all of the <commit> in the above description can be -any <tree-ish>.

+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 "SPECIFYING REVISIONS" section in git-rev-parse(1). 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 +"<commit>...<commit>") do not mean a range as defined in the "SPECIFYING RANGES" section in git-rev-parse(1).

OPTIONS

@@ -947,7 +948,7 @@ Output diff in reverse. diff --git a/git-diff.txt b/git-diff.txt index 68e65324f..db2eb46a1 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -53,23 +53,24 @@ forced by --no-index. one side is omitted, it will have the same effect as using HEAD instead. -'git-diff' [--options] ... [--] [...]:: +'git-diff' [--options] \... [--] [...]:: This form is to view the changes on the branch containing and up to the second , starting at a common ancestor - of both . "git-diff A...B" is equivalent to + of both . "git-diff A\...B" is equivalent to "git-diff $(git-merge-base A B) B". You can omit any one of , which has the same effect as using HEAD instead. Just in case if you are doing something exotic, it should be -noted that all of the in the above description can be -any . +noted that all of the in the above description, except +for the last two forms that use ".." notations, can be any +. For a more complete list of ways to spell , see "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. However, "diff" is about comparing two _endpoints_, not ranges, and the range notations (".." and -"...") do not mean a range as defined in the +"\...") do not mean a range as defined in the "SPECIFYING RANGES" section in gitlink:git-rev-parse[1]. OPTIONS diff --git a/git-format-patch.html b/git-format-patch.html index 08b446c15..adee47f9c 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -280,18 +280,39 @@ git-format-patch(1) Manual Page [--in-reply-to=Message-Id] [--suffix=.<sfx>] [--ignore-if-in-upstream] [--subject-prefix=Subject-Prefix] - <since>[..<until>] + [ <since> | <revision range> ]

DESCRIPTION

-

Prepare each commit between <since> and <until> with its patch in +

Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. -If ..<until> is not specified, the head of the current working -tree is implied. For a more complete list of ways to spell -<since> and <until>, see "SPECIFYING REVISIONS" section in -git-rev-parse(1).

-

The output of this command is convenient for e-mail submission or +The output of this command is convenient for e-mail submission or for use with git-am(1).

+

There are two ways to specify which commits to operate on.

+
    +
  1. +

    +A single commit, <since>, specifies that the commits leading + to the tip of the current branch that are not in the history + that leads to the <since> to be output. +

    +
    2. +
  2. +

    +Generic <revision range> expression (see "SPECIFYING + REVISIONS" section in git-rev-parse(1)) means the + commits in the specified range. +

    +
    3. +
+

A single commit, when interpreted as a <revision range> +expression, means "everything that leads to that commit", but +if you write git format-patch <commit>, the previous rule +applies to that command line and you do not get "everything +since the beginning of the time". If you want to format +everything since project inception to one commit, say "git +format-patch --root <commit>" to make it clear that it is the +latter case.

By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the --numbered-files option, the output file names @@ -907,6 +928,15 @@ git-format-patch origin

+git-format-patch --root origin +
+
+

+ Extract all commits which that leads to origin since the + inception of the project. +

+
+
git-format-patch -M -B origin
@@ -949,7 +979,7 @@ git-format-patch -3
diff --git a/git-format-patch.txt b/git-format-patch.txt index c514fdd93..c9857a2d6 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -16,21 +16,35 @@ SYNOPSIS [--in-reply-to=Message-Id] [--suffix=.] [--ignore-if-in-upstream] [--subject-prefix=Subject-Prefix] - [..] + [ | ] DESCRIPTION ----------- -Prepare each commit between and with its patch in +Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. -If .. is not specified, the head of the current working -tree is implied. For a more complete list of ways to spell - and , see "SPECIFYING REVISIONS" section in -gitlink:git-rev-parse[1]. - The output of this command is convenient for e-mail submission or for use with gitlink:git-am[1]. +There are two ways to specify which commits to operate on. + +1. A single commit, , specifies that the commits leading + to the tip of the current branch that are not in the history + that leads to the to be output. + +2. Generic expression (see "SPECIFYING + REVISIONS" section in gitlink:git-rev-parse[1]) means the + commits in the specified range. + +A single commit, when interpreted as a +expression, means "everything that leads to that commit", but +if you write 'git format-patch ', the previous rule +applies to that command line and you do not get "everything +since the beginning of the time". If you want to format +everything since project inception to one commit, say "git +format-patch \--root " to make it clear that it is the +latter case. + By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the --numbered-files option, the output file names @@ -153,6 +167,10 @@ git-format-patch origin:: not in the origin branch. For each commit a separate file is created in the current directory. +git-format-patch \--root origin:: + Extract all commits which that leads to 'origin' since the + inception of the project. + git-format-patch -M -B origin:: The same as the previous one. Additionally, it detects and handles renames and complete rewrites intelligently to diff --git a/git-log.html b/git-log.html index 9b49154ba..3f4b2c63e 100644 --- a/git-log.html +++ b/git-log.html @@ -743,7 +743,7 @@ git log --since="2 weeks ago" -- gitk

-git log -r --name-status release..test +git log --name-status release..test

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

diff --git a/git-log.txt b/git-log.txt index 1e6dbd93b..5ec547cc0 100644 --- a/git-log.txt +++ b/git-log.txt @@ -96,7 +96,7 @@ git log --since="2 weeks ago" \-- gitk:: The "--" is necessary to avoid confusion with the *branch* named 'gitk' -git log -r --name-status release..test:: +git log --name-status release..test:: Show the commits that are in the "test" branch but not yet in the "release" branch, along with the list of paths diff --git a/git-svn.html b/git-svn.html index 84d13d8db..b7eb7dcd3 100644 --- a/git-svn.html +++ b/git-svn.html @@ -1038,7 +1038,7 @@ listed below are allowed:

trunk = trunk/project-a:refs/remotes/project-a/trunk

Keep in mind that the (asterisk) wildcard of the local ref -(left of the :) *must be the farthest right path component; +(right of the :) *must be the farthest right path component; however the remote wildcard may be anywhere as long as it's own independent path component (surrounded by / or EOL). This type of configuration is not automatically created by init and @@ -1059,7 +1059,7 @@ should be manually entered with a text-editor or using

diff --git a/git-svn.txt b/git-svn.txt index 3420c5c95..be2e34eb8 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -549,7 +549,7 @@ listed below are allowed: ------------------------------------------------------------------------ Keep in mind that the '*' (asterisk) wildcard of the local ref -(left of the ':') *must* be the farthest right path component; +(right of the ':') *must* be the farthest right path component; however the remote wildcard may be anywhere as long as it's own independent path component (surrounded by '/' or EOL). This type of configuration is not automatically created by 'init' and diff --git a/user-manual.html b/user-manual.html index 923629302..59cdce001 100644 --- a/user-manual.html +++ b/user-manual.html @@ -380,7 +380,7 @@ echo "git shortlog --no-merges v$new ^v$last > ../ShortLog"
echo "git diff --stat --summary -M v$last v$new > ../diffstat-$new"

and then he just cut-and-pastes the output commands after verifying that they look OK.

Finding commits referencing a file with given content

Somebody hands you a copy of a file, and asks which commits modified a file such that it contained the given content either before or after the -commit. You can find out with this:

$  git log --raw -r --abbrev=40 --pretty=oneline -- filename |
+commit. You can find out with this:

$  git log --raw --abbrev=40 --pretty=oneline -- filename |
        grep -B 1 `git hash-object filename`

Figuring out why this works is left as an exercise to the (advanced) student. The git-log(1), git-diff-tree(1), and git-hash-object(1) man pages may prove helpful.

Chapter 3. Developing with git

Table of Contents

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 editing 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

Telling git your name

Before creating any commits, you should introduce yourself to git. The diff --git a/user-manual.txt b/user-manual.txt index 06ab79fbd..35298e626 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -921,7 +921,7 @@ file such that it contained the given content either before or after the commit. You can find out with this: ------------------------------------------------- -$ git log --raw -r --abbrev=40 --pretty=oneline -- filename | +$ git log --raw --abbrev=40 --pretty=oneline -- filename | grep -B 1 `git hash-object filename` ------------------------------------------------- -- 2.26.2