diff options
| author | Stefan Beller <sbeller@google.com> | 2016-03-18 14:26:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-18 14:35:31 -0700 |
| commit | 78ec240020db4bdd773830f3d41f4b4bdf9a4e2d (patch) | |
| tree | f6cbb0cff1a0608a94b55d6cf3f391c2498dc01b /Documentation/git-rebase.txt | |
| parent | 047057bb4159533b3323003f89160588c9e61fbd (diff) | |
| download | git-78ec240020db4bdd773830f3d41f4b4bdf9a4e2d.tar.gz git-78ec240020db4bdd773830f3d41f4b4bdf9a4e2d.tar.xz | |
rebase: decouple --exec from --interactive
In the later steps of preparing a patch series I do not want to
edit or reorder the patches any more, but just make sure the
test suite passes after each patch and also to fix breakage
right there if some of the steps fail. I could run
EDITOR=true git rebase -i <anchor> -x "make test"
but it would be simpler if it can be spelled like so:
git rebase <anchor> -x "make test"
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -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 6ed610a03..0387b40e0 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 |