From 42f855f6b85e5aa6ebce69b4ac12e4c8f33276a4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 6 Feb 2007 00:09:38 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0-rc3-80-g35ce --- git-blame.html | 16 ++++++++++++++-- git-blame.txt | 9 ++++++++- git-cvsexportcommit.html | 12 ++++++++++-- git-cvsexportcommit.txt | 5 ++++- git-for-each-ref.html | 4 ++-- git-for-each-ref.txt | 2 +- git-rebase.html | 27 ++++++++++++++++++++++++--- git-rebase.txt | 27 +++++++++++++++++++++++++-- git-tools.html | 14 +++++++++++++- git-tools.txt | 8 ++++++++ git.html | 2 +- 11 files changed, 110 insertions(+), 16 deletions(-) diff --git a/git-blame.html b/git-blame.html index b10a5dad7..ebdf9b84e 100644 --- a/git-blame.html +++ b/git-blame.html @@ -274,7 +274,7 @@ git-blame(1) Manual Page
git-blame [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S <revs-file>] - [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file>
+ [-M] [-C] [-C] [--since=<date>] [<rev> | --contents <file>] [--] <file>

DESCRIPTION

@@ -375,6 +375,18 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output

+--contents <file> +
+
+

+ When <rev> is not specified, the command annotates the + changes starting backwards from the working tree copy. + This flag makes the command pretend as if the working + tree copy has the contents of he named file (specify + - to make the command read from the standard input). +

+
+
-M
@@ -583,7 +595,7 @@ commit commentary), a blame viewer won't ever care.
diff --git a/git-blame.txt b/git-blame.txt index 0ee887d73..5c9888d01 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S ] - [-M] [-C] [-C] [--since=] [] [--] + [-M] [-C] [-C] [--since=] [ | --contents ] [--] DESCRIPTION ----------- @@ -67,6 +67,13 @@ OPTIONS Show the result incrementally in a format designed for machine consumption. +--contents :: + When is not specified, the command annotates the + changes starting backwards from the working tree copy. + This flag makes the command pretend as if the working + tree copy has the contents of he named file (specify + `-` to make the command read from the standard input). + -M:: Detect moving lines in the file as well. When a commit moves a block of lines in a file (e.g. the original file diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index f84d40423..84a16d070 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -272,7 +272,7 @@ git-cvsexportcommit(1) Manual Page

SYNOPSIS

-

git-cvsexportcommit [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

+

git-cvsexportcommit [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

DESCRIPTION

@@ -326,6 +326,14 @@ should the changeset be done against.

+-P +
+
+

+ Force the parent commit, even if it is not a direct parent. +

+
+
-m
@@ -386,7 +394,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 347cbcec3..27d531b88 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -8,7 +8,7 @@ git-cvsexportcommit - Export a single commit to a CVS checkout SYNOPSIS -------- -'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID +'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID DESCRIPTION @@ -46,6 +46,9 @@ OPTIONS -f:: Force the merge even if the files are not up to date. +-P:: + Force the parent commit, even if it is not a direct parent. + -m:: Prepend the commit message with the provided prefix. Useful for patch series and the like. diff --git a/git-for-each-ref.html b/git-for-each-ref.html index 029b2c1ae..598c5385a 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -359,7 +359,7 @@ refname

- The name of the ref (the part after $GIT_DIR/refs/). + The name of the ref (the part after $GIT_DIR/).

@@ -488,7 +488,7 @@ eval "$eval" diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index da52eba7b..f49b0d944 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt @@ -66,7 +66,7 @@ keys. For all objects, the following names can be used: refname:: - The name of the ref (the part after $GIT_DIR/refs/). + The name of the ref (the part after $GIT_DIR/). objecttype:: The type of the object (`blob`, `tree`, `commit`, `tag`). diff --git a/git-rebase.html b/git-rebase.html index 46b55d3d0..5cd948bde 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -367,6 +367,25 @@ branch. If we have the following situation:

A---B---C---D master

This is useful when topicB does not depend on topicA.

+

A range of commits could also be removed with rebase. If we have +the following situation:

+
+
+
    E---F---G---H---I---J  topicA
+
+

then the command

+
+
+
git-rebase --onto topicA~5 topicA~2 topicA
+
+

would result in the removal of commits F and G:

+
+
+
    E---H'---I'---J'  topicA
+
+

This is useful if F and G were flawed in some way, or should not be +part of topicA. Note that the argument to --onto and the <upstream> +parameter can be any valid commit-ish.

In case of conflict, git-rebase will stop at the first problematic commit and leave conflict markers in the tree. You can use git diff to locate the markers (<<<<<<) and make edits to resolve the conflict. For each @@ -398,7 +417,8 @@ desired resolution, you can continue the rebasing process with

Starting point at which to create the new commits. If the --onto option is not specified, the starting point is - <upstream>. + <upstream>. May be any valid commit, and not just an + existing branch name.

@@ -406,7 +426,8 @@ desired resolution, you can continue the rebasing process with

- Upstream branch to compare against. + Upstream branch to compare against. May be any valid commit, + not just an existing branch name.

@@ -559,7 +580,7 @@ a rebase. Upon completion, <branch> will be the current branch.

diff --git a/git-rebase.txt b/git-rebase.txt index 0cb9e1f10..977f661b9 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -114,6 +114,27 @@ would result in: This is useful when topicB does not depend on topicA. +A range of commits could also be removed with rebase. If we have +the following situation: + +------------ + E---F---G---H---I---J topicA +------------ + +then the command + + git-rebase --onto topicA~5 topicA~2 topicA + +would result in the removal of commits F and G: + +------------ + E---H'---I'---J' topicA +------------ + +This is useful if F and G were flawed in some way, or should not be +part of topicA. Note that the argument to --onto and the +parameter can be any valid commit-ish. + In case of conflict, git-rebase will stop at the first problematic commit and leave conflict markers in the tree. You can use git diff to locate the markers (<<<<<<) and make edits to resolve the conflict. For each @@ -141,10 +162,12 @@ OPTIONS :: Starting point at which to create the new commits. If the --onto option is not specified, the starting point is - . + . May be any valid commit, and not just an + existing branch name. :: - Upstream branch to compare against. + Upstream branch to compare against. May be any valid commit, + not just an existing branch name. :: Working branch; defaults to HEAD. diff --git a/git-tools.html b/git-tools.html index 2eacea22d..208c49451 100644 --- a/git-tools.html +++ b/git-tools.html @@ -387,6 +387,18 @@ branch and git. series in git back and forth. +
  • +

    +hg-to-git (contrib/) +

    +
    +
    +
    hg-to-git converts a Mercurial repository into a git one, and
+preserves the full branch history in the process. hg-to-git can
+also be used in an incremental way to keep the git repository
+in sync with the master Mercurial repository.
    +
    +

    • Others

    @@ -421,7 +433,7 @@ comprehensive list.

    diff --git a/git-tools.txt b/git-tools.txt index 6b407f9ad..10653ff89 100644 --- a/git-tools.txt +++ b/git-tools.txt @@ -86,6 +86,14 @@ Foreign SCM interface series in git back and forth. + - *hg-to-git* (contrib/) + + hg-to-git converts a Mercurial repository into a git one, and + preserves the full branch history in the process. hg-to-git can + also be used in an incremental way to keep the git repository + in sync with the master Mercurial repository. + + Others ------ diff --git a/git.html b/git.html index 42e8a5978..065f21a92 100644 --- a/git.html +++ b/git.html @@ -2288,7 +2288,7 @@ contributors on the git-list <git@vger.kernel.org>.

    -- 2.26.2