.nf
\fIgit\-apply\fR [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index] [\-\-apply]
- [\-\-no\-add] [\-\-index\-info] [\-\-allow\-binary\-replacement] [\-z] [\-pNUM]
- [\-CNUM] [\-\-whitespace=<nowarn|warn|error|error\-all|strip>]
- [<patch>...]
+ [\-\-no\-add] [\-\-index\-info] [\-\-allow\-binary\-replacement | \-\-binary]
+ [\-R | \-\-reverse] [\-\-reject] [\-z] [\-pNUM] [\-CNUM] [\-\-inaccurate\-eof]
+ [\-\-whitespace=<nowarn|warn|error|error\-all|strip>] [\-\-exclude=PATH]
+ [\-\-cached] [\-\-verbose] [<patch>...]
.fi
.SH "DESCRIPTION"
\-\-index
When \-\-check is in effect, or when applying the patch (which is the default when none of the options that disables it is in effect), make sure the patch is applicable to what the current index file records\&. If the file to be patched in the work tree is not up\-to\-date, it is flagged as an error\&. This flag also causes the index file to be updated\&.
+.TP
+\-\-cached
+Apply a patch without touching the working tree\&. Instead, take the cached data, apply the patch, and store the result in the index, without using the working tree\&. This implies \fI\-\-index\fR\&.
+
.TP
\-\-index\-info
Newer git\-diff output has embedded \fIindex information\fR for each blob to help identify the original version that the patch applies to\&. When this flag is given, and if the original version of the blob is available locally, outputs information about them to the standard output\&.
+.TP
+\-R, \-\-reverse
+Apply the patch in reverse\&.
+
+.TP
+\-\-reject
+For atomicity, \fBgit\-apply\fR(1) by default fails the whole patch and does not touch the working tree when some of the hunks do not apply\&. This option makes it apply the parts of the patch that are applicable, and send the rejected hunks to the standard output of the command\&.
+
.TP
\-z
When showing the index information, do not munge paths, but use NUL terminated machine readable format\&. Without this flag, the pathnames output will have TAB, LF, and backslash characters replaced with \\t, \\n, and \\\\, respectively\&.
.TP
\-\-apply
-If you use any of the options marked “Turns off "apply"” above, git\-apply reads and outputs the information you asked without actually applying the patch\&. Give this flag after those flags to also apply the patch\&.
+If you use any of the options marked "Turns off \fIapply\fR" above, \fBgit\-apply\fR(1) reads and outputs the information you asked without actually applying the patch\&. Give this flag after those flags to also apply the patch\&.
.TP
\-\-no\-add
When applying a patch, ignore additions made by the patch\&. This can be used to extract common part between two files by first running diff on them and applying the result with this option, which would apply the deletion part but not addition part\&.
.TP
-\-\-allow\-binary\-replacement
+\-\-allow\-binary\-replacement, \-\-binary
When applying a patch, which is a git\-enhanced patch that was prepared to record the pre\- and post\-image object name in full, and the path being patched exactly matches the object the patch applies to (i\&.e\&. "index" line's pre\-image object name is what is in the working tree), and the post\-image object is available in the object database, use the post\-image object as the patch result\&. This allows binary files to be patched in a very limited way\&.
+.TP
+\-\-exclude=<path\-pattern>
+Don't apply changes to files matching the given path pattern\&. This can be useful when importing patchsets, where you want to exclude certain files or directories\&.
+
.TP
\-\-whitespace=<option>
-When applying a patch, detect a new or modified line that ends with trailing whitespaces (this includes a line that solely consists of whitespaces)\&. By default, the command outputs warning messages and applies the patch\&. When git\-apply is used for statistics and not applying a patch, it defaults to nowarn\&. You can use different <option> to control this behavior:
+When applying a patch, detect a new or modified line that ends with trailing whitespaces (this includes a line that solely consists of whitespaces)\&. By default, the command outputs warning messages and applies the patch\&. When \fBgit\-apply\fR(1) is used for statistics and not applying a patch, it defaults to nowarn\&. You can use different <option> to control this behavior:
.RS
.TP 3
.RE
.IP
+.TP
+\-\-inacurate\-eof
+Under certain circumstances, some versions of diff do not correctly detect a missing new\-line at the end of the file\&. As a result, patches created by such diff programs do not record incomplete lines correctly\&. This option adds support for applying such patches by working around this bug\&.
+
+.TP
+\-\-verbose
+Report progress to stderr\&. By default, only a message about the current patch being applied will be printed\&. This option will cause additional information to be reported\&.
+
.SH "CONFIGURATION"
.TP
.SH "DESCRIPTION"
-git\-svn is a simple conduit for changesets between a single Subversion branch and git\&.
-
-
-git\-svn is not to be confused with git\-svnimport\&. The were designed with very different goals in mind\&.
+git\-svn is a simple conduit for changesets between a single Subversion branch and git\&. It is not to be confused with \fBgit\-svnimport\fR(1)\&. They were designed with very different goals in mind\&.
git\-svn is designed for an individual developer who wants a bidirectional flow of changesets between a single branch in Subversion and an arbitrary number of branches in git\&. git\-svnimport is designed for read\-only operation on repositories that match a particular layout (albeit the recommended one by SVN developers)\&.
.SH "COMMANDS"
.TP
-init
+\fIinit\fR
Creates an empty git repository with additional metadata directories for git\-svn\&. The Subversion URL must be specified as a command\-line argument\&.
.TP
-fetch
+\fIfetch\fR
Fetch unfetched revisions from the Subversion URL we are tracking\&. refs/remotes/git\-svn will be updated to the latest revision\&.
-.nf
-Note: You should never attempt to modify the remotes/git\-svn
-branch outside of git\-svn\&. Instead, create a branch from
-remotes/git\-svn and work on that branch\&. Use the 'commit'
-command (see below) to write git commits back to
-remotes/git\-svn\&.
-.fi
+Note: You should never attempt to modify the remotes/git\-svn branch outside of git\-svn\&. Instead, create a branch from remotes/git\-svn and work on that branch\&. Use the \fIcommit\fR command (see below) to write git commits back to remotes/git\-svn\&.
-.nf
-See 'Additional Fetch Arguments' if you are interested in
-manually joining branches on commit\&.
-.fi
+See \fIAdditional Fetch Arguments\fR if you are interested in manually joining branches on commit\&.
+
+.TP
+\fIdcommit\fR
+Commit all diffs from the current HEAD directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and HEAD)\&. It is recommended that you run git\-svn fetch and rebase (not pull) your commits against the latest changes in the SVN repository\&. This is advantageous over \fIcommit\fR (below) because it produces cleaner, more linear history\&.
.TP
-commit
+\fIcommit\fR
Commit specified commit or tree objects to SVN\&. This relies on your imported fetch data being up\-to\-date\&. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit\&. All merging is assumed to have taken place independently of git\-svn functions\&.
.TP
-rebuild
-Not a part of daily usage, but this is a useful command if you've just cloned a repository (using git\-clone) that was tracked with git\-svn\&. Unfortunately, git\-clone does not clone git\-svn metadata and the svn working tree that git\-svn uses for its operations\&. This rebuilds the metadata so git\-svn can resume fetch operations\&. A Subversion URL may be optionally specified at the command\-line if the directory/repository you're tracking has moved or changed protocols\&.
+\fIrebuild\fR
+Not a part of daily usage, but this is a useful command if you've just cloned a repository (using \fBgit\-clone\fR(1)) that was tracked with git\-svn\&. Unfortunately, git\-clone does not clone git\-svn metadata and the svn working tree that git\-svn uses for its operations\&. This rebuilds the metadata so git\-svn can resume fetch operations\&. A Subversion URL may be optionally specified at the command\-line if the directory/repository you're tracking has moved or changed protocols\&.
.TP
-show\-ignore
+\fIshow\-ignore\fR
Recursively finds and lists the svn:ignore property on directories\&. The output is suitable for appending to the $GIT_DIR/info/exclude file\&.
.SH "OPTIONS"
\-r <ARG>, \-\-revision <ARG>
Only used with the \fIfetch\fR command\&.
-.nf
-Takes any valid \-r<argument> svn would accept and passes it
-directly to svn\&. \-r<ARG1>:<ARG2> ranges and "{" DATE "}" syntax
-is also supported\&. This is passed directly to svn, see svn
-documentation for more details\&.
-.fi
+Takes any valid \-r<argument> svn would accept and passes it directly to svn\&. \-r<ARG1>:<ARG2> ranges and "{" DATE "}" syntax is also supported\&. This is passed directly to svn, see svn documentation for more details\&.
-.nf
This can allow you to make partial mirrors when running fetch\&.
-.fi
.TP
\-, \-\-stdin
Only used with the \fIcommit\fR command\&.
-.nf
-Read a list of commits from stdin and commit them in reverse
-order\&. Only the leading sha1 is read from each line, so
-git\-rev\-list \-\-pretty=oneline output can be used\&.
-.fi
+Read a list of commits from stdin and commit them in reverse order\&. Only the leading sha1 is read from each line, so git\-rev\-list \-\-pretty=oneline output can be used\&.
.TP
\-\-rmdir
Only used with the \fIcommit\fR command\&.
-.nf
-Remove directories from the SVN tree if there are no files left
-behind\&. SVN can version empty directories, and they are not
-removed by default if there are no files left in them\&. git
-cannot version empty directories\&. Enabling this flag will make
-the commit to SVN act like git\&.
-.fi
+Remove directories from the SVN tree if there are no files left behind\&. SVN can version empty directories, and they are not removed by default if there are no files left in them\&. git cannot version empty directories\&. Enabling this flag will make the commit to SVN act like git\&.
-.nf
repo\-config key: svn\&.rmdir
-.fi
.TP
\-e, \-\-edit
Only used with the \fIcommit\fR command\&.
-.nf
-Edit the commit message before committing to SVN\&. This is off by
-default for objects that are commits, and forced on when committing
-tree objects\&.
-.fi
+Edit the commit message before committing to SVN\&. This is off by default for objects that are commits, and forced on when committing tree objects\&.
-.nf
repo\-config key: svn\&.edit
-.fi
.TP
\-l<num>, \-\-find\-copies\-harder
Both of these are only used with the \fIcommit\fR command\&.
-.nf
-They are both passed directly to git\-diff\-tree see
-git\-diff\-tree(1) for more information\&.
-.fi
+They are both passed directly to git\-diff\-tree see \fBgit\-diff\-tree\fR(1) for more information\&.
.nf
repo\-config key: svn\&.l
\-A<filename>, \-\-authors\-file=<filename>
Syntax is compatible with the files used by git\-svnimport and git\-cvsimport:
-.nf
-loginname = Joe User <user@example\&.com>
-.fi
.nf
-If this option is specified and git\-svn encounters an SVN
-committer name that does not exist in the authors\-file, git\-svn
-will abort operation\&. The user will then have to add the
-appropriate entry\&. Re\-running the previous git\-svn command
-after the authors\-file is modified should continue operation\&.
+ loginname = Joe User <user@example\&.com>
.fi
+If this option is specified and git\-svn encounters an SVN committer name that does not exist in the authors\-file, git\-svn will abort operation\&. The user will then have to add the appropriate entry\&. Re\-running the previous git\-svn command after the authors\-file is modified should continue operation\&.
-.nf
repo\-config key: svn\&.authors\-file
-.fi
+
+.TP
+\-m, \-\-merge, \-s<strategy>, \-\-strategy=<strategy>
+These are only used with the \fIdcommit\fR command\&.
+
+Passed directly to git\-rebase when using \fIdcommit\fR if a \fIgit\-reset\fR cannot be used (see dcommit)\&.
+
+.TP
+\-n, \-\-dry\-run
+This is only used with the \fIdcommit\fR command\&.
+
+Print out the series of git arguments that would show which diffs would be committed to SVN\&.
.SH "ADVANCED OPTIONS"
\-b<refname>, \-\-branch <refname>
Used with \fIfetch\fR or \fIcommit\fR\&.
-.nf
-This can be used to join arbitrary git branches to remotes/git\-svn
-on new commits where the tree object is equivalent\&.
-.fi
+This can be used to join arbitrary git branches to remotes/git\-svn on new commits where the tree object is equivalent\&.
-.nf
-When used with different GIT_SVN_ID values, tags and branches in
-SVN can be tracked this way, as can some merges where the heads
-end up having completely equivalent content\&. This can even be
-used to track branches across multiple SVN _repositories_\&.
-.fi
+When used with different GIT_SVN_ID values, tags and branches in SVN can be tracked this way, as can some merges where the heads end up having completely equivalent content\&. This can even be used to track branches across multiple SVN _repositories_\&.
-.nf
-This option may be specified multiple times, once for each
-branch\&.
-.fi
+This option may be specified multiple times, once for each branch\&.
-.nf
repo\-config key: svn\&.branch
-.fi
.TP
\-i<GIT_SVN_ID>, \-\-id <GIT_SVN_ID>
-This sets GIT_SVN_ID (instead of using the environment)\&. See the section on "Tracking Multiple Repositories or Branches" for more information on using GIT_SVN_ID\&.
+This sets GIT_SVN_ID (instead of using the environment)\&. See the section on \fITracking Multiple Repositories or Branches\fR for more information on using GIT_SVN_ID\&.
.SH "COMPATIBILITY OPTIONS"
\-\-upgrade
Only used with the \fIrebuild\fR command\&.
-.nf
-Run this if you used an old version of git\-svn that used
-"git\-svn\-HEAD" instead of "remotes/git\-svn" as the branch
-for tracking the remote\&.
-.fi
+Run this if you used an old version of git\-svn that used "git\-svn\-HEAD" instead of "remotes/git\-svn" as the branch for tracking the remote\&.
.TP
\-\-no\-ignore\-externals
Only used with the \fIfetch\fR and \fIrebuild\fR command\&.
-.nf
-By default, git\-svn passes \-\-ignore\-externals to svn to avoid
-fetching svn:external trees into git\&. Pass this flag to enable
-externals tracking directly via git\&.
-.fi
+By default, git\-svn passes \-\-ignore\-externals to svn to avoid fetching svn:external trees into git\&. Pass this flag to enable externals tracking directly via git\&.
-.nf
-Versions of svn that do not support \-\-ignore\-externals are
-automatically detected and this flag will be automatically
-enabled for them\&.
-.fi
+Versions of svn that do not support \-\-ignore\-externals are automatically detected and this flag will be automatically enabled for them\&.
-.nf
-Otherwise, do not enable this flag unless you know what you're
-doing\&.
-.fi
+Otherwise, do not enable this flag unless you know what you're doing\&.
-.nf
repo\-config key: svn\&.noignoreexternals
-.fi
.SS "Basic Examples"
git\-svn commit <tree\-ish> [<tree\-ish_2> \&.\&.\&.]
# Commit all the git commits from my\-branch that don't exist in SVN:
git\-svn commit remotes/git\-svn\&.\&.my\-branch
-# Something is committed to SVN, pull the latest into your branch:
- git\-svn fetch && git pull \&. remotes/git\-svn
+# Something is committed to SVN, rebase the latest into your branch:
+ git\-svn fetch && git rebase remotes/git\-svn
# Append svn:ignore settings to the default git exclude file:
git\-svn show\-ignore >> \&.git/info/exclude
.fi
+.SH "REBASE VS. PULL"
+
+
+Originally, git\-svn recommended that the remotes/git\-svn branch be pulled from\&. This is because the author favored \fIgit\-svn commit B\fR to commit a single head rather than the \fIgit\-svn commit A\&.\&.B\fR notation to commit multiple commits\&.
+
+
+If you use \fIgit\-svn commit A\&.\&.B\fR to commit several diffs and you do not have the latest remotes/git\-svn merged into my\-branch, you should use \fIgit rebase\fR to update your work branch instead of \fIgit pull\fR\&. \fIpull\fR can cause non\-linear history to be flattened when committing into SVN, which can lead to merge commits reversing previous commits in SVN\&.
+
.SH "DESIGN PHILOSOPHY"
Unfetched SVN revisions may be imported as children of existing commits by specifying additional arguments to \fIfetch\fR\&. Additional parents may optionally be specified in the form of sha1 hex sums at the command\-line\&. Unfetched SVN revisions may also be tied to particular git commits with the following syntax:
.nf
-svn_revision_number=git_commit_sha1
+ svn_revision_number=git_commit_sha1
.fi
-.TP
-This allows you to tie unfetched SVN revision 375 to your current HEAD
- git\-svn fetch 375=$(git\-rev\-parse HEAD)
+
+This allows you to tie unfetched SVN revision 375 to your current HEAD:
+
+.nf
+ git\-svn fetch 375=$(git\-rev\-parse HEAD)
+.fi
.SS "Advanced Example: Tracking a Reorganized Repository"
Renamed and copied directories are not detected by git and hence not tracked when committing to SVN\&. I do not plan on adding support for this as it's quite difficult and time\-consuming to get working for all the possible corner cases (git doesn't do it, either)\&. Renamed and copied files are fully supported if they're similar enough for git to detect them\&.
+.SH "SEE ALSO"
+
+
+\fBgit\-rebase\fR(1)
+
.SH "AUTHOR"
..
.TH "GITK" 1 "" "" ""
.SH NAME
-gitk \- Some git command not yet documented.
+gitk \- git repository browser
.SH "SYNOPSIS"
-\fIgitk\fR [ \-\-option ] <args>...
+\fIgitk\fR [<option>...] [<revs>] [\-\-] [<path>...]
.SH "DESCRIPTION"
-Does something not yet documented\&.
+Displays changes in a repository or a selected set of commits\&. This includes visualizing the commit graph, showing information related to each commit, and the files in the trees of each revision\&.
+
+
+Historically, gitk was the first repository browser\&. It's written in tcl/tk and started off in a separate repository but was later merged into the main git repository\&.
.SH "OPTIONS"
+
+To control which revisions to shown, the command takes options applicable to the \fBgit\-rev\-list\fR(1) command\&. This manual page describes only the most frequently used options\&.
+
.TP
-\-\-option
-Some option not yet documented\&.
+\-n <number>, \-\-max\-count=<number>
+Limits the number of commits to show\&.
.TP
-<args>...
-Some argument not yet documented\&.
+\-\-since=<date>
+Show commits more recent than a specific date\&.
+
+.TP
+\-\-until=<date>
+Show commits older than a specific date\&.
+
+.TP
+<revs>
+Limit the revisions to show\&. This can be either a single revision meaning show from the given revision and back, or it can be a range in the form "\fI<from>\fR\&.\&.\fI<to>\fR" to show all revisions between \fI<from>\fR and back to \fI<to>\fR\&. Note, more advanced revision selection can be applied\&.
+
+.TP
+<path>
+Limit commits to the ones touching files in the given paths\&. Note, to avoid ambiguity wrt\&. revision names use "\-\-" to separate the paths from any preceeding options\&.
.SH "EXAMPLES"
gitk \-\-since="2 weeks ago" \-\- gitk
Show the changes during the last two weeks to the file \fIgitk\fR\&. The "\-\-" is necessary to avoid confusion with the \fIbranch\fR named \fIgitk\fR
+.SH "SEE ALSO"
+
+.TP
+\fIqgit(1)\fR
+A repository browser written in C++ using Qt\&.
+
+.TP
+\fIgitview(1)\fR
+A repository browser written in Python using Gtk\&. It's based on \fIbzrk(1)\fR and distributed in the contrib area of the git repository\&.
+
+.TP
+\fItig(1)\fR
+A minimal repository browser and git tool output highlighter written in C using Ncurses\&.
+
.SH "AUTHOR"
-Written by Paul Mackerras <paulus@samba\&.org>
+Written by Paul Mackerras <paulus@samba\&.org>\&.
.SH "DOCUMENTATION"
-Documentation by Junio C Hamano and the git\-list <git@vger\&.kernel\&.org>\&.
+Documentation by Junio C Hamano, Jonas Fonseca, and the git\-list <git@vger\&.kernel\&.org>\&.
.SH "GIT"
projects / git.git / commitdiff