From 3fd90c8be62fec6a303db5e3f58339f8422c2a54 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 18 Jun 2006 00:22:01 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.0-gae44 --- git-blame.html | 12 ++++++++++-- git-blame.txt | 5 ++++- git-p4import.html | 12 ++++++++++-- git-p4import.txt | 5 ++++- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/git-blame.html b/git-blame.html index 9a60c5971..8891cb369 100644 --- a/git-blame.html +++ b/git-blame.html @@ -295,7 +295,15 @@ which introduced the line. Start annotation from the given revision.

- Show long rev (Defaults off). + Show long rev (Default: off). +

+
+
+-t, --time +
+
+

+ Show raw timestamp (Default: off).

@@ -330,7 +338,7 @@ which introduced the line. Start annotation from the given revision.

diff --git a/git-blame.txt b/git-blame.txt index 0a1fa00db..bfed94591 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -20,7 +20,10 @@ OPTIONS Use the same output mode as git-annotate (Default: off). -l, --long:: - Show long rev (Defaults off). + Show long rev (Default: off). + +-t, --time:: + Show raw timestamp (Default: off). -S, --rev-file :: Use revs from revs-file instead of calling git-rev-list. diff --git a/git-p4import.html b/git-p4import.html index cd9e75a7e..dac9a2c75 100644 --- a/git-p4import.html +++ b/git-p4import.html @@ -272,7 +272,7 @@ git-p4import(1) Manual Page

SYNOPSIS

-

git-p4import [-q|-v] [--authors <file>] [-t <timezone>] <//p4repo/path> <branch>

+

git-p4import [-q|-v] [--notags] [--authors <file>] [-t <timezone>] <//p4repo/path> <branch>

git-p4import --stitch <//p4repo/path>

git-p4import

@@ -318,6 +318,14 @@ to operate (see below).

+--notags +
+
+

+ Do not create a tag for each imported commit. +

+
+
--stitch
@@ -453,7 +461,7 @@ of mappings with each line containing one mapping in the format:

diff --git a/git-p4import.txt b/git-p4import.txt index c198ff250..0858e5efb 100644 --- a/git-p4import.txt +++ b/git-p4import.txt @@ -8,7 +8,7 @@ git-p4import - Import a Perforce repository into git SYNOPSIS -------- -`git-p4import` [-q|-v] [--authors ] [-t ] +`git-p4import` [-q|-v] [--notags] [--authors ] [-t ] `git-p4import` --stitch @@ -43,6 +43,9 @@ OPTIONS Specify an authors file containing a mapping of Perforce user ids to full names and email addresses (see Notes below). +\--notags:: + Do not create a tag for each imported commit. + \--stitch:: Import the contents of the given perforce branch into the currently checked out git branch. -- 2.26.2