diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-19 19:32:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-19 19:35:55 -0800 |
| commit | efe05b019ca19328d27c07ef32b4698a7f36166f (patch) | |
| tree | a38d3c5713d39370e881c148ff0f5c9d4db59c67 /Documentation/git-commit.txt | |
| parent | ec9f0ea3e6ecf1237223dec8428e7bb73d339320 (diff) | |
| parent | 718258e256b74622aa55f5ee0cb9cff4cce6bf9f (diff) | |
| download | git-efe05b019ca19328d27c07ef32b4698a7f36166f.tar.gz | |
Merge branch 'maint' to sync with GIT 1.6.0.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 6203461f41..b5d81be7ec 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -166,7 +166,7 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].) '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 + no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. |