summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-17 23:11:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-01-17 23:11:03 (GMT)
commit9d2a24864e8f0a1ab2fc6b72c64a4f1d4aa9fe94 (patch)
tree8433cce3f129be82632e1c71f4d6744d7fb61d8f /Documentation
parent935a4783f72964e0fa72995c101542531081b094 (diff)
parentbeb635ca9ced5cd8f0eb5d2def9468f14bd243bc (diff)
downloadgit-9d2a24864e8f0a1ab2fc6b72c64a4f1d4aa9fe94.zip
git-9d2a24864e8f0a1ab2fc6b72c64a4f1d4aa9fe94.tar.gz
git-9d2a24864e8f0a1ab2fc6b72c64a4f1d4aa9fe94.tar.bz2
Merge branch 'ak/commit-only-allow-empty' into maint
"git commit --allow-empty --only" (no pathspec) with dirty index ought to be an acceptable way to create a new commit that does not change any paths, but it was forbidden, perhaps because nobody needed it so far. * ak/commit-only-allow-empty: commit: remove 'Clever' message for --only --amend commit: make --only --allow-empty work without paths
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-commit.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index f2ab0ee..4f8f20a 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -265,7 +265,8 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
If this option is specified together with `--amend`, then
no paths need to be specified, which can be used to amend
the last commit without committing changes that have
- already been staged.
+ already been staged. If used together with `--allow-empty`
+ paths are also not required, and an empty commit will be created.
-u[<mode>]::
--untracked-files[=<mode>]::