summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorAndreas Krey <a.krey@gmx.de>2016-12-02 23:15:13 +0100
committerJunio C Hamano <gitster@pobox.com>2016-12-05 12:41:06 -0800
commit319d835240b752b94ccb67f6515759824955937b (patch)
tree65508ce4b116e35dffa929b2137c08ab1ad41036 /Documentation/git-commit.txt
parent0202c411edc25940cc381bf317badcdf67670be4 (diff)
downloadgit-319d835240b752b94ccb67f6515759824955937b.tar.gz
commit: make --only --allow-empty work without paths
--only is implied when paths are present, and required them unless --amend. But with --allow-empty it should be allowed as well - it is the only way to create an empty commit in the presence of staged changes. Signed-off-by: Andreas Krey <a.krey@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-commit.txt')
-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 b0a294d3b5..374808b966 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -263,7 +263,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>]::