diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-11 23:56:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-11 23:56:09 -0700 |
| commit | 4cdda2b895dfb6ba084e3952cbf4274a6a2e0338 (patch) | |
| tree | d924f60957a287ea138ce59580c05e71e3f9c2f1 /Documentation | |
| parent | 243a60fbb5e185e2bf3c4bb1c53128b4d04d5879 (diff) | |
| parent | eed81838f0d0e031702473e1d427d71055134edd (diff) | |
| download | git-4cdda2b895dfb6ba084e3952cbf4274a6a2e0338.tar.gz git-4cdda2b895dfb6ba084e3952cbf4274a6a2e0338.tar.xz | |
Merge branch 'maint'
* maint:
bisect: fix bad rev checking in "git bisect good"
revision.c: make --date-order overriddable
git-submodule: Avoid 'fatal: cannot describe' message
Force the medium pretty format on calls to git log
Fix section about backdating tags in the git-tag docs
Document option --only of git commit
Documentation/git-request-pull: Fixed a typo ("send" -> "end")
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-commit.txt | 11 | ||||
| -rw-r--r-- | Documentation/git-request-pull.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index b4ae61ff4..4bb51cc06 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -139,6 +139,17 @@ but can be used to amend a merge commit. as well. This is usually not what you want unless you are concluding a conflicted merge. +-o|--only:: + Make a commit only from the paths specified on the + command line, disregarding any contents that have been + staged so far. This is the default mode of operation of + 'git commit' if any paths are given on the command line, + in which case this option can be omitted. + If this option is specified together with '--amend', then + no paths need be specified, which can be used to amend + the last commit without committing changes that have + already been staged. + -u|--untracked-files:: Show all untracked files, also those in uninteresting directories, in the "Untracked files:" section of commit diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt index 270df9b18..9a14c04e3 100644 --- a/Documentation/git-request-pull.txt +++ b/Documentation/git-request-pull.txt @@ -24,7 +24,7 @@ OPTIONS URL to include in the summary. <end>:: - Commit to send at; defaults to HEAD. + Commit to end at; defaults to HEAD. Author ------ diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 4b6fd90ea..9712392f7 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -233,14 +233,14 @@ the tag object affects, for example, the ordering of tags in the gitweb interface. To set the date used in future tag objects, set the environment -variable GIT_AUTHOR_DATE to one or more of the date and time. The +variable GIT_COMMITTER_DATE to one or more of the date and time. The date and time can be specified in a number of ways; the most common is "YYYY-MM-DD HH:MM". An example follows. ------------ -$ GIT_AUTHOR_DATE="2006-10-02 10:31" git tag -s v1.0.1 +$ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1 ------------ |