From 092f5f02b5ca9e56e35050fd479495f5018b94b1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 2 Aug 2007 07:23:38 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc3-120-g68d422 --- RelNotes-1.5.3.txt | 14 +++++++++++++- git-branch.html | 6 +++--- git-branch.txt | 4 ++-- git-diff.html | 24 ++++++++++++------------ git-diff.txt | 22 +++++++++++----------- git-merge.html | 12 ++++++------ git-merge.txt | 10 +++++----- git-reset.html | 18 +++++++++--------- git-reset.txt | 16 ++++++++-------- 9 files changed, 69 insertions(+), 57 deletions(-) diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt index 785bd3845..03d18430e 100644 --- a/RelNotes-1.5.3.txt +++ b/RelNotes-1.5.3.txt @@ -40,6 +40,9 @@ Updates since v1.5.2 $GIT_DIR to work in a subdirectory of a working tree that is not located at "$GIT_DIR/..". + - Giving "--file=" option to "git config" is the same as + running the command with GIT_CONFIG= environment. + - "git log" learned a new option "--follow", to follow renaming history of a single file. @@ -50,6 +53,9 @@ Updates since v1.5.2 - "git-cvsserver" learned new options (--base-path, --export-all, --strict-paths) inspired by git-daemon. + - "git daemon --base-path-relaxed" can help migrating a repository URL + that did not use to use --base-path to use --base-path. + - "git-commit" can use "-t templatefile" option and commit.template configuration variable to prime the commit message given to you in the editor. @@ -120,6 +126,9 @@ Updates since v1.5.2 of the format ('tgz', 'tbz2' or 'zip'). Please update the your configuration file accordingly. + - "git diff" (but not the plumbing level "git diff-tree") now + recursively descends into trees by default. + - The editor to use with many interactive commands can be overridden with GIT_EDITOR environment variable, or if it does not exist, with core.editor configuration variable. As @@ -165,6 +174,9 @@ Updates since v1.5.2 - The diffstat given after a merge (or a pull) honors the color.diff configuration. + - "git commit --amend" is now compatible with various message source + options such as -m/-C/-c/-F. + - "git-apply --whitespace=strip" removes blank lines added at the end of the file. @@ -262,6 +274,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.3-rc3 +O=v1.5.3-rc3-119-g50cff52 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-branch.html b/git-branch.html index 56e562d62..f846de943 100644 --- a/git-branch.html +++ b/git-branch.html @@ -494,12 +494,12 @@ $ git branch -D test (2)

  1. -delete remote-tracking branches "todo", "html", "man" +Delete remote-tracking branches "todo", "html", "man"

  2. -delete "test" branch even if the "master" branch does not have all +Delete "test" branch even if the "master" branch does not have all commits from test branch.

    3. @@ -527,7 +527,7 @@ a branch and check it out with a single command.

    diff --git a/git-branch.txt b/git-branch.txt index bc6aa8841..33bc31b0d 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -134,8 +134,8 @@ $ git branch -d -r origin/todo origin/html origin/man <1> $ git branch -D test <2> ------------ + -<1> delete remote-tracking branches "todo", "html", "man" -<2> delete "test" branch even if the "master" branch does not have all +<1> Delete remote-tracking branches "todo", "html", "man" +<2> Delete "test" branch even if the "master" branch does not have all commits from test branch. diff --git a/git-diff.html b/git-diff.html index f64ce2cd5..addaa38e3 100644 --- a/git-diff.html +++ b/git-diff.html @@ -778,18 +778,18 @@ $ git diff HEAD (3)

    1. -changes in the working tree not yet staged for the next commit. +Changes in the working tree not yet staged for the next commit.

    2. -changes between the index and your last commit; what you +Changes between the index and your last commit; what you would be committing if you run "git commit" without "-a" option.

    3. -changes in the working tree since your last commit; what you +Changes in the working tree since your last commit; what you would be committing if you run "git commit -a"

      4. @@ -808,20 +808,20 @@ $ git diff HEAD^ HEAD (3)

      1. -instead of using the tip of the current branch, compare with the +Instead of using the tip of the current branch, compare with the tip of "test" branch.

      2. -instead of comparing with the tip of "test" branch, compare with +Instead of comparing with the tip of "test" branch, compare with the tip of the current branch, but limit the comparison to the file "test".

      3. -compare the version before the last commit and the last commit. +Compare the version before the last commit and the last commit.

      @@ -839,19 +839,19 @@ $ git diff arch/i386 include/asm-i386 (3)

      1. -show only modification, rename and copy, but not addition +Show only modification, rename and copy, but not addition nor deletion.

      2. -show only names and the nature of change, but not actual +Show only names and the nature of change, but not actual diff output.

      3. -limit diff output to named subtrees. +Limit diff output to named subtrees.

      @@ -868,13 +868,13 @@ $ git diff -R (2)

      1. -spend extra cycles to find renames, copies and complete +Spend extra cycles to find renames, copies and complete rewrites (very expensive).

      2. -output diff in reverse. +Output diff in reverse.

      @@ -895,7 +895,7 @@ output diff in reverse. diff --git a/git-diff.txt b/git-diff.txt index b1f5e7f93..b36e705dd 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -76,10 +76,10 @@ $ git diff --cached <2> $ git diff HEAD <3> ------------ + -<1> changes in the working tree not yet staged for the next commit. -<2> changes between the index and your last commit; what you +<1> Changes in the working tree not yet staged for the next commit. +<2> Changes between the index and your last commit; what you would be committing if you run "git commit" without "-a" option. -<3> changes in the working tree since your last commit; what you +<3> Changes in the working tree since your last commit; what you would be committing if you run "git commit -a" Comparing with arbitrary commits:: @@ -90,12 +90,12 @@ $ git diff HEAD -- ./test <2> $ git diff HEAD^ HEAD <3> ------------ + -<1> instead of using the tip of the current branch, compare with the +<1> Instead of using the tip of the current branch, compare with the tip of "test" branch. -<2> instead of comparing with the tip of "test" branch, compare with +<2> Instead of comparing with the tip of "test" branch, compare with the tip of the current branch, but limit the comparison to the file "test". -<3> compare the version before the last commit and the last commit. +<3> Compare the version before the last commit and the last commit. Limiting the diff output:: @@ -106,11 +106,11 @@ $ git diff --name-status <2> $ git diff arch/i386 include/asm-i386 <3> ------------ + -<1> show only modification, rename and copy, but not addition +<1> Show only modification, rename and copy, but not addition nor deletion. -<2> show only names and the nature of change, but not actual +<2> Show only names and the nature of change, but not actual diff output. -<3> limit diff output to named subtrees. +<3> Limit diff output to named subtrees. Munging the diff output:: + @@ -119,9 +119,9 @@ $ git diff --find-copies-harder -B -C <1> $ git diff -R <2> ------------ + -<1> spend extra cycles to find renames, copies and complete +<1> Spend extra cycles to find renames, copies and complete rewrites (very expensive). -<2> output diff in reverse. +<2> Output diff in reverse. Author diff --git a/git-merge.html b/git-merge.html index c8e8e58dc..888d57bc6 100644 --- a/git-merge.html +++ b/git-merge.html @@ -506,23 +506,23 @@ pull after you are done and ready.

      1. -the results are updated both in the index file and in your - working tree, +The results are updated both in the index file and in your + working tree;

      2. -index file is written out as a tree, +Index file is written out as a tree;

      3. -the tree gets committed, and +The tree gets committed; and

      4. -the HEAD pointer gets advanced. +The HEAD pointer gets advanced.

      @@ -606,7 +606,7 @@ Resolve the conflicts. git-diff would report only the diff --git a/git-merge.txt b/git-merge.txt index 2c9db98a3..144bc16ff 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -107,11 +107,11 @@ pull after you are done and ready. When things cleanly merge, these things happen: -1. the results are updated both in the index file and in your - working tree, -2. index file is written out as a tree, -3. the tree gets committed, and -4. the `HEAD` pointer gets advanced. +1. The results are updated both in the index file and in your + working tree; +2. Index file is written out as a tree; +3. The tree gets committed; and +4. The `HEAD` pointer gets advanced. Because of 2., we require that the original state of the index file to match exactly the current `HEAD` commit; otherwise we diff --git a/git-reset.html b/git-reset.html index 6edc24205..c510bcd39 100644 --- a/git-reset.html +++ b/git-reset.html @@ -356,7 +356,7 @@ message, or both. Leaves working tree as it was before "reset".

    4. -make corrections to working tree files. +Make corrections to working tree files.

    5. @@ -434,7 +434,7 @@ $ git pull git://info.example.com/ nitfol (4)

      1. -you are happily working on something, and find the changes +You are happily working on something, and find the changes in these files are in good order. You do not want to see them when you run "git diff", because you plan to work on other files and changes with these files are distracting. @@ -442,12 +442,12 @@ and changes with these files are distracting.

      2. -somebody asks you to pull, and the changes sounds worthy of merging. +Somebody asks you to pull, and the changes sounds worthy of merging.

      3. -however, you already dirtied the index (i.e. your index does +However, you already dirtied the index (i.e. your index does not match the HEAD commit). But you know the pull you are going to make does not affect frotz.c nor filfre.c, so you revert the index changes for these two files. Your changes in working tree @@ -456,7 +456,7 @@ remain there.

      4. -then you can pull and merge, leaving frotz.c and filfre.c +Then you can pull and merge, leaving frotz.c and filfre.c changes still in the working tree.

        5. @@ -481,7 +481,7 @@ $ git reset --hard ORIG_HEAD (4)

        1. -try to update from the upstream resulted in a lot of +Try to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later.

          @@ -495,13 +495,13 @@ from the index file and the working tree.

        2. -merge a topic branch into the current branch, which resulted +Merge a topic branch into the current branch, which resulted in a fast forward.

        3. -but you decided that the topic branch is not ready for public +But you decided that the topic branch is not ready for public consumption yet. "pull" or "merge" always leaves the original tip of the current branch in ORIG_HEAD, so resetting hard to it brings your index file and the working tree back to that state, @@ -567,7 +567,7 @@ At this point the index file still has all the WIP changes you

          diff --git a/git-reset.txt b/git-reset.txt index 19c5b9bbd..15e3aca9a 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -63,7 +63,7 @@ $ git commit -a -c ORIG_HEAD <3> <1> This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before "reset". -<2> make corrections to working tree files. +<2> Make corrections to working tree files. <3> "reset" copies the old head to .git/ORIG_HEAD; redo the commit by starting with its log message. If you do not need to edit the message further, you can give -C option instead. @@ -106,17 +106,17 @@ $ git reset <3> $ git pull git://info.example.com/ nitfol <4> ------------ + -<1> you are happily working on something, and find the changes +<1> You are happily working on something, and find the changes in these files are in good order. You do not want to see them when you run "git diff", because you plan to work on other files and changes with these files are distracting. -<2> somebody asks you to pull, and the changes sounds worthy of merging. -<3> however, you already dirtied the index (i.e. your index does +<2> Somebody asks you to pull, and the changes sounds worthy of merging. +<3> However, you already dirtied the index (i.e. your index does not match the HEAD commit). But you know the pull you are going to make does not affect frotz.c nor filfre.c, so you revert the index changes for these two files. Your changes in working tree remain there. -<4> then you can pull and merge, leaving frotz.c and filfre.c +<4> Then you can pull and merge, leaving frotz.c and filfre.c changes still in the working tree. Undo a merge or pull:: @@ -133,15 +133,15 @@ Fast forward $ git reset --hard ORIG_HEAD <4> ------------ + -<1> try to update from the upstream resulted in a lot of +<1> Try to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later. <2> "pull" has not made merge commit, so "git reset --hard" which is a synonym for "git reset --hard HEAD" clears the mess from the index file and the working tree. -<3> merge a topic branch into the current branch, which resulted +<3> Merge a topic branch into the current branch, which resulted in a fast forward. -<4> but you decided that the topic branch is not ready for public +<4> But you decided that the topic branch is not ready for public consumption yet. "pull" or "merge" always leaves the original tip of the current branch in ORIG_HEAD, so resetting hard to it brings your index file and the working tree back to that state, -- 2.26.2