diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-06-28 16:05:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-28 16:05:14 -0700 |
commit | 644936c8e6226404882bc1c81d13142ccbf226af (patch) | |
tree | 050c06669725a47e1097915ce8a30677a8dccec9 /git-rebase.html | |
parent | 9257a333196c775f827e9f2af65b5349e999b5fa (diff) | |
download | git-htmldocs-644936c8e6226404882bc1c81d13142ccbf226af.tar.gz |
Autogenerated HTML docs for v1.7.11.1-104-ge7b44
Diffstat (limited to 'git-rebase.html')
-rw-r--r-- | git-rebase.html | 54 |
1 files changed, 50 insertions, 4 deletions
diff --git a/git-rebase.html b/git-rebase.html index be5037d9f..983f8c848 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -583,9 +583,9 @@ git-rebase(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="verseblock-content"><em>git rebase</em> [-i | --interactive] [options] [--onto <newbase>]
+<div class="verseblock-content"><em>git rebase</em> [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
[<upstream>] [<branch>]
-<em>git rebase</em> [-i | --interactive] [options] --onto <newbase>
+<em>git rebase</em> [-i | --interactive] [options] [--exec <cmd>] --onto <newbase>
--root [<branch>]
<em>git rebase</em> --continue | --skip | --abort</div>
<div class="verseblock-attribution">
@@ -782,7 +782,7 @@ rebase.autosquash <div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
-<newbase>
+--onto <newbase>
</dt>
<dd>
<p>
@@ -1043,6 +1043,35 @@ with the <tt>--interactive</tt> option explicitly is generally not a good idea unless you know what you are doing (see BUGS below).</p></div>
</dd>
<dt class="hdlist1">
+-x <cmd>
+</dt>
+<dt class="hdlist1">
+--exec <cmd>
+</dt>
+<dd>
+<p>
+ Append "exec <cmd>" after each line creating a commit in the
+ final history. <cmd> will be interpreted as one or more shell
+ commands.
+</p>
+<div class="paragraph"><p>This option can only be used with the <tt>--interactive</tt> option
+(see INTERACTIVE MODE below).</p></div>
+<div class="paragraph"><p>You may execute several commands by either using one instance of <tt>--exec</tt>
+with several commands:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>git rebase -i --exec "cmd1 && cmd2 && ..."</tt></pre>
+</div></div>
+<div class="paragraph"><p>or by giving more than one <tt>--exec</tt>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>git rebase -i --exec "cmd1" --exec "cmd2" --exec ...</tt></pre>
+</div></div>
+<div class="paragraph"><p>If <tt>--autosquash</tt> is used, "exec" lines will not be appended for
+the intermediate commits, and will only appear at the end of each
+squash/fixup series.</p></div>
+</dd>
+<dt class="hdlist1">
--root
</dt>
<dd>
@@ -1440,6 +1469,23 @@ continue with <tt>git rebase --continue</tt>.</p></div> in <tt>$SHELL</tt>, or the default shell if <tt>$SHELL</tt> is not set), so you can
use shell features (like "cd", ">", ";" …). The command is run from
the root of the working tree.</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>$ git rebase -i --exec "make test"</tt></pre>
+</div></div>
+<div class="paragraph"><p>This command lets you check that intermediate commits are compilable.
+The todo list becomes like that:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>pick 5928aea one
+exec make test
+pick 04d0fda two
+exec make test
+pick ba46169 three
+exec make test
+pick f4593f9 four
+exec make test</tt></pre>
+</div></div>
</div>
<h2 id="_splitting_commits">SPLITTING COMMITS</h2>
<div class="sectionbody">
@@ -1657,7 +1703,7 @@ reorder commits tend to produce counterintuitive results.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-02 15:00:44 PDT
+Last updated 2012-06-28 16:04:22 PDT
</div>
</div>
</body>
|