diff options
author | 2018-02-21 12:45:04 -0800 | |
---|---|---|
committer | 2018-02-21 12:45:04 -0800 | |
commit | 2f6128daab0764c3915dcc9e01c27381b63f5e40 (patch) | |
tree | 927fac93c9596bf67ae85e67b0f98ddb47b2d6da /Documentation | |
parent | Merge branch 'lw/daemon-log-destination' (diff) | |
parent | rebase: add --allow-empty-message option (diff) | |
download | tgif-2f6128daab0764c3915dcc9e01c27381b63f5e40.tar.xz |
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.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 8a861c1e0d..d713951b86 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. |