summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-06 15:58:21 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-06 15:58:21 -0700
commitbec5da4921ecdf10f30acd425332ad4c40801c8b (patch)
tree9dd5d7a62bf70c503bf8ce1136df706920e42583 /git-rebase.txt
parent4ba4a78f046a4424d303350cbbbf47b04b728b11 (diff)
downloadgit-htmldocs-bec5da4921ecdf10f30acd425332ad4c40801c8b.tar.gz
Autogenerated HTML docs for v2.8.1-101-g72d91
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 6ed610a03..0387b40e0 100644
--- a/git-rebase.txt
+++ b/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