Autogenerated manpages for v1.5.1-rc3-20-gaa453

diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1
index 013a1acc4c0b5045335ac2efc25c8f47e903827a..49ea89259fc46bbe6f94de9e40a91afd4cbfe8f6 100644 (file)
--- a/man1/git-mergetool.1
+++ b/man1/git-mergetool.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\-MERGETOOL" "1" "03/19/2007" "" ""
+.TH "GIT\-MERGETOOL" "1" "03/30/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -19,13 +19,8 @@ If one or more <file> parameters are given, the merge tool program will be run t
 .TP
 \-t or \-\-tool=<tool>
 Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
-.sp
-.nf
-If a merge resolution program is not specified, 'git mergetool'
-will use the configuration variable merge.tool.  If the
-configuration variable merge.tool is not set, 'git mergetool'
-will pick a suitable default.
-.fi
+
+If a merge resolution program is not specified, \fIgit mergetool\fR will use the configuration variable merge.tool. If the configuration variable merge.tool is not set, \fIgit mergetool\fR will pick a suitable default.
 .SH "AUTHOR"
 Written by Theodore Y Ts'o <tytso@mit.edu>
 .SH "DOCUMENTATION"

diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1
index 29ee6c92bcd5fa307a012b1e30e782e80d1813be..60c5a844be07c834fa9a2104b5436dff9d254b28 100644 (file)
--- a/man1/git-rev-parse.1
+++ b/man1/git-rev-parse.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\-REV\-PARSE" "1" "03/01/2007" "" ""
+.TH "GIT\-REV\-PARSE" "1" "03/30/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -176,14 +176,14 @@ Two other shorthands for naming a set that is formed by a commit and its parent
 Here are a handful examples:
 .sp
 .nf
-D                A B D
-D F              A B C D F
-^A G             B D
-^A F             B C F
-G...I            C D F G I
-^B G I           C D F G I
-F^@              A B C
-F^! H            D F H
+D                G H D
+D F              G H I J D F
+^G D             H D
+^D B             E I J F B
+B...C            G H D E B C
+^D B C           E I J F B C
+C^@              I J F
+F^! D            G H D F
 .fi
 .SH "AUTHOR"
 Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>

diff --git a/man1/git-svnimport.1 b/man1/git-svnimport.1
index 93db432edb28d7c8b84dd0c1088dba9cbc734cab..5dc9fbb743973f33e63c45104521a831bb08d224 100644 (file)
--- a/man1/git-svnimport.1
+++ b/man1/git-svnimport.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\-SVNIMPORT" "1" "01/07/2007" "" ""
+.TH "GIT\-SVNIMPORT" "1" "03/30/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -25,7 +25,7 @@ Imports a SVN repository into git. It will either create a new repository, or in
 
 SVN access is done by the SVN::Perl module.
 
-git\-svnimport assumes that SVN repositories are organized into one "trunk" directory where the main development happens, "branch/FOO" directories for branches, and "/tags/FOO" directories for tags. Other subdirectories are ignored.
+git\-svnimport assumes that SVN repositories are organized into one "trunk" directory where the main development happens, "branches/FOO" directories for branches, and "/tags/FOO" directories for tags. Other subdirectories are ignored.
 
 git\-svnimport creates a file ".git/svn2git", which is required for incremental SVN imports.
 .SH "OPTIONS"

diff --git a/man7/git.7 b/man7/git.7
index 0e5245aad1be99af5c7bf6bb3b16337e38304501..270b4c5d422ae33958e067fe927574d60888fc35 100644 (file)
--- 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" "03/29/2007" "" ""
+.TH "GIT" "7" "03/30/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)