From: Junio C Hamano Date: Thu, 5 Jul 2007 05:51:38 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3-rc0-30-g114f X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28d8ede23f022507f55c91fdc009374fc335cc19;p=git.git Autogenerated HTML docs for v1.5.3-rc0-30-g114f --- diff --git a/config.txt b/config.txt index 1d96adf30..66a55b051 100644 --- a/config.txt +++ b/config.txt @@ -281,6 +281,10 @@ core.excludesfile:: of files which are not meant to be tracked. See gitlink:gitignore[5]. +core.pager:: + The command that git will use to paginate output. Can be overridden + with the `GIT_PAGER` environment variable. + alias.*:: Command aliases for the gitlink:git[1] command wrapper - e.g. after defining "alias.last = cat-file commit HEAD", the invocation diff --git a/git-config.html b/git-config.html index 671937a47..eec0eef81 100644 --- a/git-config.html +++ b/git-config.html @@ -1012,6 +1012,15 @@ core.excludesfile

+core.pager +
+
+

+ The command that git will use to paginate output. Can be overridden + with the GIT_PAGER environment variable. +

+
+
alias.*
@@ -1820,7 +1829,7 @@ transfer.unpackLimit diff --git a/git-filter-branch.html b/git-filter-branch.html index f241d88cb..97f146bdf 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -294,7 +294,7 @@ have no effect and result in the new branch pointing to the same branch as your current branch. Nevertheless, this may be useful in the future for compensating for some git bugs or such, therefore such a usage is permitted.

-

WARNING! The rewritten history will have different object names for all +

WARNING! The rewritten history will have different object names for all the objects and will not converge with the original branch. You will not be able to easily push and distribute the rewritten branch on top of the original branch. Please do not use this command if you do not know the @@ -311,11 +311,12 @@ argument is always evaluated in shell using the eval command. Prior to that, the $GIT_COMMIT environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, -and GIT_COMMITTER_DATE is set according to the current commit.

+and GIT_COMMITTER_DATE are set according to the current commit.

A map function is available that takes an "original sha1 id" argument and outputs a "rewritten sha1 id" if the commit has been already -rewritten, fails otherwise; the map function can return several -ids on separate lines if your commit filter emitted multiple commits.

+rewritten, and "original sha1 id" otherwise; the map function can +return several ids on separate lines if your commit filter emitted +multiple commits.

OPTIONS

@@ -342,7 +343,7 @@ ids on separate lines if your commit filter emitted multiple commits.

directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore - rules HAVE ANY EFFECT!). + rules HAVE ANY EFFECT!).

@@ -419,8 +420,9 @@ definition impossible to preserve signatures at any rate.)

- Only ever look at the history, which touches the given subdirectory. - The result will contain that directory as its project root. + Only look at the history which touches the given subdirectory. + The result will contain that directory (and only that) as its + project root.

@@ -464,11 +466,12 @@ or copyright violation) from all commits:

Now, you will get the rewritten history saved in the branch newbranch (your current branch is left untouched).

-

To "etch-graft" a commit to the revision history (set a commit to be -the parent of the current initial commit and propagate that):

+

To set a commit (which typically is at the tip of another +history) to be the parent of the current initial commit, in +order to paste the other history behind the current history:

-
git filter-branch --parent-filter sed\ 's/^$/-p <graft-id>/' newbranch
+
git filter-branch --parent-filter 'sed "s/^\$/-p <graft-id>/"' newbranch

(if the parent string is empty - therefore we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes @@ -479,6 +482,12 @@ happened). If this is not the case, use:

git filter-branch --parent-filter \
         'cat; test $GIT_COMMIT = <commit-id> && echo "-p <graft-id>"' newbranch
+

or even simpler:

+
+
+
echo "$commit-id $graft-id" >> .git/info/grafts
+git filter-branch newbranch $graft-id..
+

To remove commits authored by "Darl McBribe" from the history:

@@ -552,7 +561,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 2074f319a..219a81db0 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -31,7 +31,7 @@ branch as your current branch. Nevertheless, this may be useful in the future for compensating for some git bugs or such, therefore such a usage is permitted. -WARNING! The rewritten history will have different object names for all +*WARNING*! The rewritten history will have different object names for all the objects and will not converge with the original branch. You will not be able to easily push and distribute the rewritten branch on top of the original branch. Please do not use this command if you do not know the @@ -54,12 +54,13 @@ argument is always evaluated in shell using the 'eval' command. Prior to that, the $GIT_COMMIT environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, -and GIT_COMMITTER_DATE is set according to the current commit. +and GIT_COMMITTER_DATE are set according to the current commit. A 'map' function is available that takes an "original sha1 id" argument and outputs a "rewritten sha1 id" if the commit has been already -rewritten, fails otherwise; the 'map' function can return several -ids on separate lines if your commit filter emitted multiple commits. +rewritten, and "original sha1 id" otherwise; the 'map' function can +return several ids on separate lines if your commit filter emitted +multiple commits. OPTIONS @@ -78,7 +79,7 @@ OPTIONS directory set to the root of the checked out tree. The new tree is then used as-is (new files are auto-added, disappeared files are auto-removed - neither .gitignore files nor any other ignore - rules HAVE ANY EFFECT!). + rules *HAVE ANY EFFECT*!). --index-filter :: This is the filter for rewriting the index. It is similar to the @@ -128,8 +129,9 @@ attached, the rewritten tag won't have it. Sorry. (It is by definition impossible to preserve signatures at any rate.) --subdirectory-filter :: - Only ever look at the history, which touches the given subdirectory. - The result will contain that directory as its project root. + Only look at the history which touches the given subdirectory. + The result will contain that directory (and only that) as its + project root. -d :: Use this option to set the path to the temporary directory used for @@ -165,12 +167,13 @@ git filter-branch --index-filter 'git update-index --remove filename' newbranch Now, you will get the rewritten history saved in the branch 'newbranch' (your current branch is left untouched). -To "etch-graft" a commit to the revision history (set a commit to be -the parent of the current initial commit and propagate that): +To set a commit (which typically is at the tip of another +history) to be the parent of the current initial commit, in +order to paste the other history behind the current history: ----------------------------------------------------------------------- -git filter-branch --parent-filter sed\ 's/^$/-p /' newbranch ----------------------------------------------------------------------- +------------------------------------------------------------------------ +git filter-branch --parent-filter 'sed "s/^\$/-p /"' newbranch +------------------------------------------------------------------------ (if the parent string is empty - therefore we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes @@ -182,6 +185,13 @@ git filter-branch --parent-filter \ 'cat; test $GIT_COMMIT = && echo "-p "' newbranch ------------------------------------------------------------------------------- +or even simpler: + +----------------------------------------------- +echo "$commit-id $graft-id" >> .git/info/grafts +git filter-branch newbranch $graft-id.. +----------------------------------------------- + To remove commits authored by "Darl McBribe" from the history: ------------------------------------------------------------------------------ diff --git a/git-stash.html b/git-stash.html index 9ec4029e8..2e36538c4 100644 --- a/git-stash.html +++ b/git-stash.html @@ -368,7 +368,7 @@ the HEAD commit. The ancestry graph looks like this:

       .----W
       /    /
-...--H----I
+-----H----I

where H is the HEAD commit, I is a commit that records the state of the index, and W is a commit that records the state of the working @@ -453,7 +453,7 @@ $ git stash apply

diff --git a/git-stash.txt b/git-stash.txt index 35888b43c..ad95ed9ce 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -85,7 +85,7 @@ the `HEAD` commit. The ancestry graph looks like this: .----W / / - ...--H----I + -----H----I where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working