From f73298917b2310e4a57967019df1b9c4c2080d23 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 4 Jul 2007 06:41:42 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.3-rc0-11-ge2b1a --- man1/git-diff-files.1 | 8 ++- man1/git-diff-index.1 | 8 ++- man1/git-diff-tree.1 | 8 ++- man1/git-diff.1 | 8 ++- man1/git-filter-branch.1 | 152 +++++++++++++++++++++++++++++++++++++++ man1/git-format-patch.1 | 11 ++- man1/git-fsck.1 | 4 +- man7/git.7 | 5 +- 8 files changed, 196 insertions(+), 8 deletions(-) create mode 100644 man1/git-filter-branch.1 diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 99576b968..ca4b74b8c 100644 --- a/man1/git-diff-files.1 +++ b/man1/git-diff-files.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF\-FILES" "1" "07/02/2007" "Git 1.5.2.2.646.g71e55" "Git Manual" +.TH "GIT\-DIFF\-FILES" "1" "07/04/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -134,6 +134,12 @@ Make the program exit with codes similar to diff(1). That is, it exits with 1 if .TP \-\-quiet Disable all output of the program. Implies \-\-exit\-code. +.TP +\-\-ext\-diff +Allow an external diff helper to be executed. If you set an external diff driver with gitlink:gitattributes(5), you need to use this option with gitlink:git\-log(1) and friends. +.TP +\-\-no\-ext\-diff +Disallow external diff drivers. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index e642765c9..10fd9e2c8 100644 --- a/man1/git-diff-index.1 +++ b/man1/git-diff-index.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF\-INDEX" "1" "07/02/2007" "Git 1.5.2.2.646.g71e55" "Git Manual" +.TH "GIT\-DIFF\-INDEX" "1" "07/04/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -134,6 +134,12 @@ Make the program exit with codes similar to diff(1). That is, it exits with 1 if .TP \-\-quiet Disable all output of the program. Implies \-\-exit\-code. +.TP +\-\-ext\-diff +Allow an external diff helper to be executed. If you set an external diff driver with gitlink:gitattributes(5), you need to use this option with gitlink:git\-log(1) and friends. +.TP +\-\-no\-ext\-diff +Disallow external diff drivers. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 67ecfb208..8a0bb13d6 100644 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-tree.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF\-TREE" "1" "07/02/2007" "Git 1.5.2.2.646.g71e55" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "07/04/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -143,6 +143,12 @@ Make the program exit with codes similar to diff(1). That is, it exits with 1 if .TP \-\-quiet Disable all output of the program. Implies \-\-exit\-code. +.TP +\-\-ext\-diff +Allow an external diff helper to be executed. If you set an external diff driver with gitlink:gitattributes(5), you need to use this option with gitlink:git\-log(1) and friends. +.TP +\-\-no\-ext\-diff +Disallow external diff drivers. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 544ea9fc9..87944f896 100644 --- a/man1/git-diff.1 +++ b/man1/git-diff.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF" "1" "06/16/2007" "Git 1.5.2.1.255.gca6c0" "Git Manual" +.TH "GIT\-DIFF" "1" "07/04/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -156,6 +156,12 @@ Make the program exit with codes similar to diff(1). That is, it exits with 1 if .TP \-\-quiet Disable all output of the program. Implies \-\-exit\-code. +.TP +\-\-ext\-diff +Allow an external diff helper to be executed. If you set an external diff driver with gitlink:gitattributes(5), you need to use this option with gitlink:git\-log(1) and friends. +.TP +\-\-no\-ext\-diff +Disallow external diff drivers. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 new file mode 100644 index 000000000..8c225dda2 --- /dev/null +++ b/man1/git-filter-branch.1 @@ -0,0 +1,152 @@ +.\" ** You probably do not want to edit this file directly ** +.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). +.\" Instead of manually editing it, you probably should edit the DocBook XML +.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. +.TH "GIT\-FILTER\-BRANCH" "1" "07/04/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +git\-filter\-branch \- Rewrite branches +.SH "SYNOPSIS" +.sp +.nf +\fIgit\-filter\-branch\fR [\-\-env\-filter ] [\-\-tree\-filter ] + [\-\-index\-filter ] [\-\-parent\-filter ] + [\-\-msg\-filter ] [\-\-commit\-filter ] + [\-\-tag\-name\-filter ] [\-\-subdirectory\-filter ] + [\-d ] [\&...] +.fi +.SH "DESCRIPTION" +Lets you rewrite git revision history by creating a new branch from your current branch, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved. + +The command takes the new branch name as a mandatory argument and the filters as optional arguments. If you specify no filters, the commits will be recommitted without any changes, which would normally 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 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 full implications, and avoid using it anyway, if a simple single commit would suffice to fix your problem. + +Always verify that the rewritten version is correct before disposing the original branch. + +Note that since this operation is extensively I/O expensive, it might be a good idea to redirect the temporary directory off\-disk, e.g. on tmpfs. Reportedly the speedup is very noticeable. +.SS "Filters" +The filters are applied in the order as listed below. The argument is always evaluated in shell using the \fIeval\fR 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. + +A \fImap\fR 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 \fImap\fR function can return several ids on separate lines if your commit filter emitted multiple commits. +.SH "OPTIONS" +.TP +\-\-env\-filter +This is the filter for modifying the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see \fBgit\-commit\fR(1) for details). Do not forget to re\-export the variables. +.TP +\-\-tree\-filter +This is the filter for rewriting the tree and its contents. The argument is evaluated in shell with the working 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!). +.TP +\-\-index\-filter +This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. For hairy cases, see \fBgit\-update\-index\fR(1). +.TP +\-\-parent\-filter +This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in a format accepted by \fBgit\-commit\-tree\fR(1): empty for the initial commit, "\-p parent" for a normal commit and "\-p parent1 \-p parent2 \-p parent3 \&..." for a merge commit. +.TP +\-\-msg\-filter +This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message. +.TP +\-\-commit\-filter +This is the filter for performing the commit. If this filter is specified, it will be called instead of the \fBgit\-commit\-tree\fR(1) command, with arguments of the form " [\-p ]\&..." and the log message on stdin. The commit id is expected on stdout. + +As a special extension, the commit filter may emit multiple commit ids; in that case, ancestors of the original commit will have all of them as parents. +.TP +\-\-tag\-name\-filter +This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output. + +The original tags are not deleted, but can be overwritten; use "\-\-tag\-name\-filter=cat" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul. + +Note that there is currently no support for proper rewriting of tag objects; in layman terms, if the tag has a message or signature attached, the rewritten tag won't have it. Sorry. (It is by definition impossible to preserve signatures at any rate.) +.TP +\-\-subdirectory\-filter +Only ever look at the history, which touches the given subdirectory. The result will contain that directory as its project root. +.TP +\-d +Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporary checkout the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the \fI.git\-rewrite/\fR directory but you can override that choice by this parameter. +.TP + +When options are given after the new branch name, they will be passed to \fBgit\-rev\-list\fR(1). Only commits in the resulting output will be filtered, although the filtered commits can still reference parents which are outside of that set. +.SH "EXAMPLES" +Suppose you want to remove a file (containing confidential information or copyright violation) from all commits: +.sp +.nf +git filter\-branch \-\-tree\-filter 'rm filename' newbranch +.fi +A significantly faster version: +.sp +.nf +git filter\-branch \-\-index\-filter 'git update\-index \-\-remove filename' newbranch +.fi +Now, you will get the rewritten history saved in the branch \fInewbranch\fR (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): +.sp +.nf +git filter\-branch \-\-parent\-filter sed\\ 's/^$/\-p /' newbranch +.fi +(if the parent string is empty \- therefore we are dealing with the initial commit \- add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use: +.sp +.nf +git filter\-branch \-\-parent\-filter \\ + 'cat; test $GIT_COMMIT = && echo "\-p "' newbranch +.fi +To remove commits authored by "Darl McBribe" from the history: +.sp +.nf +git filter\-branch \-\-commit\-filter ' + if [ "$GIT_AUTHOR_NAME" = "Darl McBribe" ]; + then + shift; + while [ \-n "$1" ]; + do + shift; + echo "$1"; + shift; + done; + else + git commit\-tree "$@"; + fi' newbranch +.fi +The shift magic first throws away the tree id and then the \-p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit. + +To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top\-most revision that a \fIgit rev\-list\fR of this range will print. + +Note that the changes introduced by the commits, and not reverted by subsequent commits, will still be in the rewritten branch. If you want to throw out _changes_ together with the commits, you should use the interactive mode of \fBgit\-rebase\fR(1). + +Consider this history: +.sp +.nf + D\-\-E\-\-F\-\-G\-\-H + / / +A\-\-B\-\-\-\-\-C +.fi +To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use: +.sp +.nf +git filter\-branch ... new\-H C..H +.fi +To rewrite commits E,F,G,H, use one of these: +.sp +.nf +git filter\-branch ... new\-H C..H \-\-not D +git filter\-branch ... new\-H D..H \-\-not C +.fi +To move the whole tree into a subdirectory, or remove it from there: +.sp +.nf +git filter\-branch \-\-index\-filter \\ + 'git ls\-files \-s | sed "s\-\\t\-&newsubdir/\-" | + GIT_INDEX_FILE=$GIT_INDEX_FILE.new \\ + git update\-index \-\-index\-info && + mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' directorymoved +.fi +.SH "AUTHOR" +Written by Petr "Pasky" Baudis , and the git list +.SH "DOCUMENTATION" +Documentation by Petr Baudis and the git list. +.SH "GIT" +Part of the \fBgit\fR(7) suite + diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index 83de75a6b..bed342fb0 100644 --- a/man1/git-format-patch.1 +++ b/man1/git-format-patch.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-FORMAT\-PATCH" "1" "07/03/2007" "Git 1.5.3.rc0" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "07/04/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -154,9 +154,18 @@ Make the program exit with codes similar to diff(1). That is, it exits with 1 if .TP \-\-quiet Disable all output of the program. Implies \-\-exit\-code. +.TP +\-\-ext\-diff +Allow an external diff helper to be executed. If you set an external diff driver with gitlink:gitattributes(5), you need to use this option with gitlink:git\-log(1) and friends. +.TP +\-\-no\-ext\-diff +Disallow external diff drivers. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP +\- +Limits the number of patches to prepare. +.TP \-o|\-\-output\-directory Use to store the resulting files, instead of the current working directory. .TP diff --git a/man1/git-fsck.1 b/man1/git-fsck.1 index 9d7f44c3d..1b0a02288 100644 --- a/man1/git-fsck.1 +++ b/man1/git-fsck.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-FSCK" "1" "07/03/2007" "Git 1.5.3.rc0" "Git Manual" +.TH "GIT\-FSCK" "1" "07/04/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -49,7 +49,7 @@ Enable more strict checking, namely to catch a file mode recorded with g+w bit s Be chatty. .TP \-\-lost\-found -Write dangling refs into .git/commit/ or .git/other/, depending on type. +Write dangling refs into .git/lost\-found/commit/ or .git/lost\-found/other/, depending on type. It tests SHA1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the \fI\-\-unreachable\fR flag it will also print out objects that exist but that aren't readable from any of the specified head nodes. diff --git a/man7/git.7 b/man7/git.7 index cb3539cae..d757d18e0 100644 --- a/man7/git.7 +++ b/man7/git.7 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT" "7" "07/03/2007" "Git 1.5.3.rc0" "Git Manual" +.TH "GIT" "7" "07/04/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -174,6 +174,9 @@ Converts old\-style git repository. \fBgit\-fast\-import\fR(1) Backend for fast Git data importers. .TP +\fBgit\-filter\-branch\fR(1) +Rewrite branches. +.TP \fBgit\-lost\-found\fR(1) Recover lost refs that luckily have not yet been pruned. .TP -- 2.26.2