diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-29 01:52:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-29 01:52:43 -0700 |
| commit | 39231b1c32caee10c7ac3397341ea0c6cf56e7f9 (patch) | |
| tree | 5e51fb9d639bf6b6b99ae5d01286360b7303f2f1 /Documentation | |
| parent | 4342572600f446b9f8db553df03d458229f944dd (diff) | |
| parent | e9d54bd18bcf5dc9eb68eb1cba9a6a7ba3f71fd6 (diff) | |
| download | git-39231b1c32caee10c7ac3397341ea0c6cf56e7f9.tar.gz git-39231b1c32caee10c7ac3397341ea0c6cf56e7f9.tar.xz | |
Merge branch 'maint'
* maint:
http.c: Fix problem with repeated calls of http_init
Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
Fix import-tars fix.
Update .mailmap with "Michael"
Do not barf on too long action description
Catch empty pathnames in trees during fsck
Don't allow empty pathnames in fast-import
import-tars: be nice to wrong directory modes
git-svn: Added 'find-rev' command
git shortlog documentation: add long options and fix a typo
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-commit-tree.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-shortlog.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-svn.txt | 5 | ||||
| -rw-r--r-- | Documentation/git.txt | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index cf25507f8..1571dbbb7 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -60,6 +60,7 @@ either `.git/config` file, or using the following environment variables. GIT_AUTHOR_DATE GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL + GIT_COMMITTER_DATE (nb "<", ">" and "\n"s are stripped) diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index 1c8c55ef6..15cc6f77c 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] -git-shortlog [-n|--number] [-s|--summary] [<committish>...] +git-shortlog [-n|--numbered] [-s|--summary] [<committish>...] DESCRIPTION ----------- @@ -22,14 +22,14 @@ Additionally, "[PATCH]" will be stripped from the commit description. OPTIONS ------- --h:: +-h, \--help:: Print a short usage message and exit. --n:: +-n, \--numbered:: Sort output according to the number of commits per author instead of author alphabetic order. --s:: +-s, \--summary:: Suppress commit description and provide a commit count summary only. FILES diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index a0d34e005..a35b9de3b 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -159,6 +159,11 @@ New features: Any other arguments are passed directly to `git log' -- +'find-rev':: + When given an SVN revision number of the form 'rN', returns the + corresponding git commit hash. When given a tree-ish, returns the + corresponding SVN revision number. + 'set-tree':: You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on diff --git a/Documentation/git.txt b/Documentation/git.txt index ca1f78f79..08ba53ae0 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -344,6 +344,7 @@ git Commits 'GIT_AUTHOR_DATE':: 'GIT_COMMITTER_NAME':: 'GIT_COMMITTER_EMAIL':: +'GIT_COMMITTER_DATE':: see gitlink:git-commit-tree[1] git Diffs |