diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
| commit | fc5201ac9f17abf8b70b248b17595f3f3d35c056 (patch) | |
| tree | 59d1b7aa95bddfce3c535e8a3c752ef9298ff632 /Documentation | |
| parent | Merge branch 'master' into next (diff) | |
| parent | diff options: add --color (diff) | |
| download | tgif-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.xz | |
Merge branch 'js/diff'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-blame.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-p4import.txt | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 0a1fa00db0..bfed945914 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/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 <revs-file>:: Use revs from revs-file instead of calling git-rev-list. diff --git a/Documentation/git-p4import.txt b/Documentation/git-p4import.txt index c198ff2502..0858e5efbe 100644 --- a/Documentation/git-p4import.txt +++ b/Documentation/git-p4import.txt @@ -8,7 +8,7 @@ git-p4import - Import a Perforce repository into git 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> @@ -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. |