From 319d835240b752b94ccb67f6515759824955937b Mon Sep 17 00:00:00 2001 From: Andreas Krey Date: Fri, 2 Dec 2016 23:15:13 +0100 Subject: 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 Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/git-commit.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation/git-commit.txt') 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[]:: --untracked-files[=]:: -- cgit v1.3