summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-21 20:45:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-21 20:45:04 (GMT)
commit2f6128daab0764c3915dcc9e01c27381b63f5e40 (patch)
tree927fac93c9596bf67ae85e67b0f98ddb47b2d6da /Documentation
parentc2bd43d66dab958d72bee58d319df55600158f2e (diff)
parenta6c612b528a22fe9d4cad8807e36d18f2f0fea2c (diff)
downloadgit-2f6128daab0764c3915dcc9e01c27381b63f5e40.zip
git-2f6128daab0764c3915dcc9e01c27381b63f5e40.tar.gz
git-2f6128daab0764c3915dcc9e01c27381b63f5e40.tar.bz2
Merge branch 'gs/rebase-allow-empty-message'
"git rebase" learned to take "--allow-empty-message" option. * gs/rebase-allow-empty-message: rebase: add --allow-empty-message option
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 8a861c1..d713951 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -244,6 +244,11 @@ leave out at most one of A and B, in which case it defaults to HEAD.
Keep the commits that do not change anything from its
parents in the result.
+--allow-empty-message::
+ By default, rebasing commits with an empty message will fail.
+ This option overrides that behavior, allowing commits with empty
+ messages to be rebased.
+
--skip::
Restart the rebasing process by skipping the current patch.