From a8cc1d89becb271f194a70827ae548d577d57c1e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 10 Mar 2011 01:18:12 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.7.4.1-225-g83c3c --- RelNotes/1.7.5.txt | 30 +++++++++++++++++++++++++++--- git-cherry-pick.html | 40 +++++++++++++++++++++++++++++++++++++++- git-cherry-pick.txt | 19 +++++++++++++++++++ git-commit.html | 9 +++++---- git-commit.txt | 7 ++++--- git-for-each-ref.html | 20 ++++++++++++++++---- git-for-each-ref.txt | 18 +++++++++++++++--- git-ls-remote.html | 4 ++-- git-ls-remote.txt | 2 +- git-rev-parse.html | 7 +++++-- gitrevisions.html | 7 +++++-- revisions.txt | 5 ++++- 12 files changed, 142 insertions(+), 26 deletions(-) diff --git a/RelNotes/1.7.5.txt b/RelNotes/1.7.5.txt index 56c3863f04..64372df755 100644 --- a/RelNotes/1.7.5.txt +++ b/RelNotes/1.7.5.txt @@ -8,6 +8,8 @@ Updates since v1.7.4 * Various git-p4 enhancements (in contrib). + * Various vcs-svn enhancements. + * "git config" used to be also known as "git repo-config", but the old name is now officially deprecated. @@ -17,7 +19,14 @@ Updates since v1.7.4 * "git cherry-pick" and "git revert" can be told to use custom merge strategy, similar to "git rebase". - * "rev-list --objects $revs -- $pathspec" would limit the objects listed + * "git cherry-pick" remembers which commit failed to apply when it is + stopped by conflicts, making it unnecessary to use "commit -c $commit" + to conclude it. + + * "git grep --no-index" did not honor pathspecs correctly, returning + paths outside the specified area. + + * "git rev-list --objects $revs -- $pathspec" would limit the objects listed in its output properly with the pathspec, in preparation for narrow clones. @@ -43,14 +52,29 @@ Fixes since v1.7.4 All of the fixes in the v1.7.4.X maintenance series are included in this release, unless otherwise noted. + * "git clone /no/such/path" did not fail correctly (jk/fail-null/clone). + + * "git checkout $other_branch" silently removed untracked symbolic links + in the working tree that are in the way in order to check out paths + under it from the named branch (js/checkout-untracked-symlink). + + * "git diff --stat -B" ran on binary files counted the changes in lines, + which was nonsensical (jk/diffstat-binary). + + * "git diff -M" opportunisticly detected copies, which was not + necessarily a good thing, especially when it is internally run by + recursive merge. + * "git merge" triggers prepare-commit-msg hook. Earlier, only "git commit" to conclude an interrupted merge triggered the hook, leading to an inconsistent overall user experience (js/maint-merge-use-prepare-commit-msg-hook). + * "git submodule update" used to honor --merge/--rebase option (or + corresponding configuration variables) even for a newly cloned + subprojects, which made no sense (so/submodule-no-update-first-time). --- exec >/var/tmp/1 -O=v1.7.4 -O=v1.7.4.1-140-g8978166 +O=v1.7.4.1-224-g66ecd2d echo O=$(git describe 'master') git shortlog --no-merges ^maint ^$O master diff --git a/git-cherry-pick.html b/git-cherry-pick.html index ce97130db7..f19f6a35ff 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -421,6 +421,44 @@ git-cherry-pick(1) Manual Page

Given one or more existing commits, apply the change each one introduces, recording a new commit for each. This requires your working tree to be clean (no modifications from the HEAD commit).

+

When it is not obvious how to apply a change, the following +happens:

+
    +
  1. +

    +The current branch and HEAD pointer stay at the last commit + successfully made. +

    +
    2. +
  2. +

    +The CHERRY_PICK_HEAD ref is set to point at the commit that + introduced the change that is difficult to apply. +

    +
    3. +
  3. +

    +Paths in which the change applied cleanly are updated both + in the index file and in your working tree. +

    +
    4. +
  4. +

    +For conflicting paths, the index file records up to three + versions, as described in the "TRUE MERGE" section of + git-merge(1). The working tree files will include + a description of the conflict bracketed by the usual + conflict markers <<<<<<< and >>>>>>>. +

    +
    5. +
  5. +

    +No other modifications are made. +

    +
    6. +
+

See git-merge(1) for some hints on resolving such +conflicts.

OPTIONS

@@ -684,7 +722,7 @@ context lines.
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 749d68a72b..5d85daa5fe 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -16,6 +16,25 @@ Given one or more existing commits, apply the change each one introduces, recording a new commit for each. This requires your working tree to be clean (no modifications from the HEAD commit). +When it is not obvious how to apply a change, the following +happens: + +1. The current branch and `HEAD` pointer stay at the last commit + successfully made. +2. The `CHERRY_PICK_HEAD` ref is set to point at the commit that + introduced the change that is difficult to apply. +3. Paths in which the change applied cleanly are updated both + in the index file and in your working tree. +4. For conflicting paths, the index file records up to three + versions, as described in the "TRUE MERGE" section of + linkgit:git-merge[1]. The working tree files will include + a description of the conflict bracketed by the usual + conflict markers `<<<<<<<` and `>>>>>>>`. +5. No other modifications are made. + +See linkgit:git-merge[1] for some hints on resolving such +conflicts. + OPTIONS ------- ...:: diff --git a/git-commit.html b/git-commit.html index a3f1069438..2ee36c7c07 100644 --- a/git-commit.html +++ b/git-commit.html @@ -542,9 +542,10 @@ that, you can recover from it with git reset.

- When used with -C/-c/--amend options, declare that the - authorship of the resulting commit now belongs of the committer. - This also renews the author timestamp. + When used with -C/-c/--amend options, or when committing after a + a conflicting cherry-pick, declare that the authorship of the + resulting commit now belongs of the committer. This also renews + the author timestamp.

@@ -1123,7 +1124,7 @@ Junio C Hamano <gitster@pobox.com>< diff --git a/git-commit.txt b/git-commit.txt index 8f89f6f08c..411fa68e9d 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -84,9 +84,10 @@ OPTIONS linkgit:git-rebase[1] for details. --reset-author:: - When used with -C/-c/--amend options, declare that the - authorship of the resulting commit now belongs of the committer. - This also renews the author timestamp. + When used with -C/-c/--amend options, or when committing after a + a conflicting cherry-pick, declare that the authorship of the + resulting commit now belongs of the committer. This also renews + the author timestamp. --short:: When doing a dry-run, give the output in the short-format. See diff --git a/git-for-each-ref.html b/git-for-each-ref.html index dfa775321f..5822a3c046 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -581,7 +581,7 @@ the date by adding one of :default, :relative, :short

EXAMPLES

An example directly producing formatted text. Show the most recent -3 tagged commits::

+3 tagged commits:

#!/bin/sh
@@ -596,7 +596,7 @@ Ref: %(*refname)
 ' 'refs/tags'

A simple example showing the use of shell eval on the output, -demonstrating the use of --shell. List the prefixes of all heads::

+demonstrating the use of --shell. List the prefixes of all heads:

#!/bin/sh
@@ -609,7 +609,7 @@ do
 done

A bit more elaborate report on tags, demonstrating that the format -may be an entire script::

+may be an entire script:

#!/bin/sh
@@ -661,9 +661,21 @@ eval=`git for-each-ref --shell --format="$fmt" \
 eval "$eval"
+

Author

+
+

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

+
+

Documentation

+
+

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

+
+

GIT

+
+

Part of the git(1) suite

+
diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index fac1cf55e5..152e695c81 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt @@ -123,7 +123,7 @@ EXAMPLES -------- An example directly producing formatted text. Show the most recent -3 tagged commits:: +3 tagged commits: ------------ #!/bin/sh @@ -140,7 +140,7 @@ Ref: %(*refname) A simple example showing the use of shell eval on the output, -demonstrating the use of --shell. List the prefixes of all heads:: +demonstrating the use of --shell. List the prefixes of all heads: ------------ #!/bin/sh @@ -154,7 +154,7 @@ done A bit more elaborate report on tags, demonstrating that the format -may be an entire script:: +may be an entire script: ------------ #!/bin/sh @@ -204,3 +204,15 @@ eval=`git for-each-ref --shell --format="$fmt" \ refs/tags` eval "$eval" ------------ + +Author +------ +Written by Junio C Hamano . + +Documentation +------------- +Documentation by Junio C Hamano and the git-list . + +GIT +--- +Part of the linkgit:git[1] suite diff --git a/git-ls-remote.html b/git-ls-remote.html index 339bcd327f..9386985227 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -416,7 +416,7 @@ git-ls-remote(1) Manual Page
git ls-remote [--heads] [--tags] [-u <exec> | --upload-pack <exec>] - <repository> <refs>…
+ <repository> [<refs>…]
@@ -517,7 +517,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 diff --git a/git-ls-remote.txt b/git-ls-remote.txt index abe7bf9ff9..3422765827 100644 --- a/git-ls-remote.txt +++ b/git-ls-remote.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git ls-remote' [--heads] [--tags] [-u | --upload-pack ] - ... + [...] DESCRIPTION ----------- diff --git a/git-rev-parse.html b/git-rev-parse.html index 89f918e91b..260b4760ae 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -788,7 +788,8 @@ A symbolic ref name. E.g. master typically means the commit

  • if $GIT_DIR/<name> exists, that is what you mean (this is usually - useful only for HEAD, FETCH_HEAD, ORIG_HEAD and MERGE_HEAD); + useful only for HEAD, FETCH_HEAD, ORIG_HEAD, MERGE_HEAD + and CHERRY_PICK_HEAD);

  • @@ -823,7 +824,9 @@ way, to record the position of the HEAD before their operation, so that you can change the tip of the branch back to the state before you ran them easily. MERGE_HEAD records the commit(s) you are merging into your branch -when you run git merge.

    +when you run git merge. +CHERRY_PICK_HEAD records the commit you are cherry-picking +when you run git cherry-pick.

    Note that any of the refs/* cases above may come either from the $GIT_DIR/refs directory or from the $GIT_DIR/packed-refs file.

    • diff --git a/gitrevisions.html b/gitrevisions.html index e791ccc40e..e5e9edcd76 100644 --- a/gitrevisions.html +++ b/gitrevisions.html @@ -464,7 +464,8 @@ A symbolic ref name. E.g. master typically means the commit

  • if $GIT_DIR/<name> exists, that is what you mean (this is usually - useful only for HEAD, FETCH_HEAD, ORIG_HEAD and MERGE_HEAD); + useful only for HEAD, FETCH_HEAD, ORIG_HEAD, MERGE_HEAD + and CHERRY_PICK_HEAD);

  • @@ -499,7 +500,9 @@ way, to record the position of the HEAD before their operation, so that you can change the tip of the branch back to the state before you ran them easily. MERGE_HEAD records the commit(s) you are merging into your branch -when you run git merge.

    +when you run git merge. +CHERRY_PICK_HEAD records the commit you are cherry-picking +when you run git cherry-pick.

    Note that any of the refs/* cases above may come either from the $GIT_DIR/refs directory or from the $GIT_DIR/packed-refs file.

    • diff --git a/revisions.txt b/revisions.txt index 9e92734bc1..04fceee253 100644 --- a/revisions.txt +++ b/revisions.txt @@ -25,7 +25,8 @@ blobs contained in a commit. first match in the following rules: . if `$GIT_DIR/` exists, that is what you mean (this is usually - useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD` and `MERGE_HEAD`); + useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD` + and `CHERRY_PICK_HEAD`); . otherwise, `refs/` if exists; @@ -46,6 +47,8 @@ you can change the tip of the branch back to the state before you ran them easily. MERGE_HEAD records the commit(s) you are merging into your branch when you run 'git merge'. +CHERRY_PICK_HEAD records the commit you are cherry-picking +when you run 'git cherry-pick'. + Note that any of the `refs/*` cases above may come either from the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file. -- 2.11.4.GIT