diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-06 18:39:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-06 18:39:09 (GMT) |
| commit | 2c657edce704ec7e91dfc03de5d882b4327369f4 (patch) | |
| tree | 9b31fd6e125296c3d19b3e759d377661f11d672d /Documentation | |
| parent | 3e95e47c5d0a09593c9a9ac50f84d04de577c6b0 (diff) | |
| parent | 8172c421d2c60a827bf300583fc2a676489d23af (diff) | |
| download | git-2c657edce704ec7e91dfc03de5d882b4327369f4.zip git-2c657edce704ec7e91dfc03de5d882b4327369f4.tar.gz git-2c657edce704ec7e91dfc03de5d882b4327369f4.tar.bz2 | |
Merge branch 'sb/rebase-x'
"git rebase -x" can be used without passing "-i" option.
* sb/rebase-x:
t3404: cleanup double empty lines between tests
rebase: decouple --exec from --interactive
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 6ed610a..0387b40 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -391,9 +391,6 @@ idea unless you know what you are doing (see BUGS below). final history. <cmd> will be interpreted as one or more shell commands. + -This option can only be used with the `--interactive` option -(see INTERACTIVE MODE below). -+ You may execute several commands by either using one instance of `--exec` with several commands: + @@ -406,6 +403,9 @@ or by giving more than one `--exec`: If `--autosquash` is used, "exec" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series. ++ +This uses the `--interactive` machinery internally, but it can be run +without an explicit `--interactive`. --root:: Rebase all commits reachable from <branch>, instead of |