.\" 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" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-DIFF\-FILES" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
:100644 100644 5be4a4...... 000000...... M file.c
.fi
When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively.
+.SH "DIFF FORMAT FOR MERGES"
+"git\-diff\-tree" and "git\-diff\-files" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way:
+.TP 3
+1.
+there is a colon for each parent
+.TP
+2.
+there are more "src" modes and "src" sha1
+.TP
+3.
+status is concatenated status characters for each parent
+.TP
+4.
+no optional "score" number
+.TP
+5.
+single path, only for "dst"
+
+Example:
+.sp
+.nf
+::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c
+.fi
+Note that \fIcombined diff\fR lists only files which were modified from all parents.
.SH "GENERATING PATCHES WITH \-P"
When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.
.\" 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" "04/22/2007" "" ""
+.TH "GIT\-DIFF\-INDEX" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
:100644 100644 5be4a4...... 000000...... M file.c
.fi
When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively.
+.SH "DIFF FORMAT FOR MERGES"
+"git\-diff\-tree" and "git\-diff\-files" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way:
+.TP 3
+1.
+there is a colon for each parent
+.TP
+2.
+there are more "src" modes and "src" sha1
+.TP
+3.
+status is concatenated status characters for each parent
+.TP
+4.
+no optional "score" number
+.TP
+5.
+single path, only for "dst"
+
+Example:
+.sp
+.nf
+::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c
+.fi
+Note that \fIcombined diff\fR lists only files which were modified from all parents.
.SH "GENERATING PATCHES WITH \-P"
When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.
.\" 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" "04/22/2007" "Git 1.5.1.1.98.gedb4f" "Git Manual"
+.TH "GIT\-DIFF\-TREE" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
:100644 100644 5be4a4...... 000000...... M file.c
.fi
When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively.
+.SH "DIFF FORMAT FOR MERGES"
+"git\-diff\-tree" and "git\-diff\-files" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way:
+.TP 3
+1.
+there is a colon for each parent
+.TP
+2.
+there are more "src" modes and "src" sha1
+.TP
+3.
+status is concatenated status characters for each parent
+.TP
+4.
+no optional "score" number
+.TP
+5.
+single path, only for "dst"
+
+Example:
+.sp
+.nf
+::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c
+.fi
+Note that \fIcombined diff\fR lists only files which were modified from all parents.
.SH "GENERATING PATCHES WITH \-P"
When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.
.\" 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\-REMOTE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-REMOTE" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
With \-f option, git fetch <name> is run immediately after the remote information is set up.
-With \-t <branch> option, instead of the default glob refspec for the remote to track all branches under $GIT_DIR/remotes/<name>/, a refspec to track only <branch> is created. You can give more than one \-t <branch> to track multiple branche without grabbing all branches.
+With \-t <branch> option, instead of the default glob refspec for the remote to track all branches under $GIT_DIR/remotes/<name>/, a refspec to track only <branch> is created. You can give more than one \-t <branch> to track multiple branches without grabbing all branches.
With \-m <master> option, $GIT_DIR/remotes/<name>/HEAD is set up to point at remote's <master> branch instead of whatever branch the HEAD at the remote repository actually points at.
.TP
.\" 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\-SVN" "1" "05/01/2007" "Git 1.5.2.rc1" "Git Manual"
+.TH "GIT\-SVN" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.TP
\fIinit\fR
Initializes an empty git repository with additional metadata directories for git\-svn. The Subversion URL may be specified as a command\-line argument, or as full URL arguments to \-T/\-t/\-b. Optionally, the target directory to operate on can be specified as a second argument. Normally this command initializes the current directory.
+.RS
.TP
\-T<trunk_subdir> , \-\-trunk=<trunk_subdir> , \-t<tags_subdir> , \-\-tags=<tags_subdir> , \-b<branches_subdir> , \-\-branches=<branches_subdir>
These are optional command\-line options for init. Each of these flags can point to a relative repository path (\-\-tags=project/tags') or a full url (\-\-tags=https://foo.org/project/tags)
.TP
\-\-prefix=<prefix>
This allows one to specify a prefix which is prepended to the names of remotes if trunk/branches/tags are specified. The prefix does not automatically include a trailing slash, so be sure you include one in the argument if that is what you want. This is useful if you wish to track multiple projects that share a common repository.
+.RE
.TP
\fIfetch\fR
Fetch unfetched revisions from the Subversion remote we are tracking. The name of the [svn\-remote "\&..."] section in the .git/config file may be specified as an optional command\-line argument.
This accepts all options that \fIgit\-svn fetch\fR and \fIgit\-rebase\fR accepts. However \fI\-\-fetch\-all\fR only fetches from the current [svn\-remote], and not all [svn\-remote] definitions.
Like \fIgit\-rebase\fR; this requires that the working tree be clean and have no uncommitted changes.
-
-+
+.RS
.TP
\-l , \-\-local
Do not fetch remotely; only run \fIgit\-rebase\fR against the last fetched commit from the upstream SVN.
-
-+
+.RE
.TP
\fIdcommit\fR
Commit each diff from a specified head directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in git. It is recommended that you run git\-svn fetch and rebase (not pull or merge) your commits against the latest changes in the SVN repository. An optional command\-line argument may be specified as an alternative to HEAD. This is advantageous over \fIset\-tree\fR (below) because it produces cleaner, more linear history.
+.RS
+.TP
+\-\-no\-rebase
+After committing, do not rebase or reset.
+.RE
.TP
\fIlog\fR
This should make it easy to look up svn log messages when svn users refer to \-r/\-\-revision numbers.
projects / git.git / commitdiff