From 937e9646bce0c48647d1fac6c63511228baa8cb2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 30 Mar 2007 08:52:28 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.1-rc3-20-gaa453 --- man1/git-mergetool.1 | 11 +++-------- man1/git-rev-parse.1 | 18 +++++++++--------- man1/git-svnimport.1 | 4 ++-- man7/git.7 | 2 +- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index 013a1acc4..49ea89259 100644 --- 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 parameters are given, the merge tool program will be run t .TP \-t or \-\-tool= Use the merge resolution program specified by . 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 .SH "DOCUMENTATION" diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1 index 29ee6c92b..60c5a844b 100644 --- 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 and Junio C Hamano diff --git a/man1/git-svnimport.1 b/man1/git-svnimport.1 index 93db432ed..5dc9fbb74 100644 --- 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 0e5245aad..270b4c5d4 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" "03/29/2007" "" "" +.TH "GIT" "7" "03/30/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) -- 2.26.2