Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196])
	by mail-b.sr.ht (Postfix) with ESMTPS id 0A620FF125
	for <~sircmpwn/public-inbox@lists.sr.ht>; Thu, 19 Nov 2020 08:48:25 +0000 (UTC)
X-Originating-IP: 82.234.69.236
Received: from localhost.localdomain (lan31-5-82-234-69-236.fbx.proxad.net [82.234.69.236])
	(Authenticated sender: denis@laxalde.org)
	by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 704AAE0009;
	Thu, 19 Nov 2020 08:48:23 +0000 (UTC)
From: denis@laxalde.org
To: ~sircmpwn/public-inbox@lists.sr.ht
Cc: Denis Laxalde <denis@laxalde.org>
Subject: [PATCH git-rebase.io v2] Add a section about 'git rebase --autosquash'
Date: Thu, 19 Nov 2020 09:48:13 +0100
Message-Id: <20201119084813.18886-1-denis@laxalde.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201118092428.14516-1-denis.laxalde@dalibo.com>
References: <20201118092428.14516-1-denis.laxalde@dalibo.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

From: Denis Laxalde <denis@laxalde.org>

---
 index.html | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/index.html b/index.html
index 3be9b14..f0c92d9 100644
--- a/index.html
+++ b/index.html
@@ -73,6 +73,7 @@
         <ol>
           <li><a href="#amending">Amending your last commit</a></li>
           <li><a href="#fixup">Fixing up older commits</a></li>
+          <li><a href="#autosquash">Automating interactive rebase todo list</a></li>
           <li><a href="#squash">Squashing several commits into one</a></li>
           <li><a href="#edit">Splitting one commit into several</a></li>
           <li><a href="#reorder">Reordering commits</a></li>
@@ -187,6 +188,42 @@ git commit -a -m"fixup greeting.txt"</pre>
         <pre>$ git log -2 --oneline
 <span style="color: #A80">fcff6ae (</span><span style="color: blue">HEAD -&gt;</span> <span style="color: green">master</span><span style="color: #cc9000">)</span> Add farewell.txt
 <span style="color: #A80">a479e94</span> Add greeting.txt</pre>
+
+        <h2 id="autosquash">Automating interactive rebase todo list</h2>
+        <p>
+          The steps described above can also be performed in a more automated
+          manner by taking advantage of the <code>--autosquash</code> option
+          of <code>git rebase</code> in combination with the
+          <code>--fixup</code> option of <code>git commit</code>:
+        </p>
+        <pre>git commit -a --fixup HEAD^
+git rebase -i --autosquash HEAD~3</pre>
+        <p>
+          This will prepare the rebase plan with commits reordered and
+          actions set up:
+        </p>
+        <pre><!--
+--><span style="color: #A80">pick</span> <span style="color: #06c">8d3fc77</span> <span style="color: purple">Add greeting.txt</span>
+<span style="color: #A80">fixup</span> <span style="color: #06c">0b9d0bb</span> <span style="color: purple">fixup! Add greeting.txt</span>
+<span style="color: #A80">pick</span> <span style="color: #06c">2a73a77</span> <span style="color: purple">Add farewell.txt</span>
+
+<span style="color: grey"># Rebase f5f19fb..0b9d0bb onto f5f19fb (3 commands)
+#
+# Commands:
+# p, pick &lt;commit&gt; = use commit
+# f, fixup &lt;commit&gt; = like "squash", but discard this commit's log message</span>
+        </pre>
+        <p>
+          In addition to <code>--fixup</code>, the <code>--squash</code>
+          option for <code>git commit</code> also exists and will allow you to
+          edit the commit message.
+        </p>
+        <p>
+          Finally, the <code>--autosquash</code> option can be omitted by
+          setting this behavior as the default through configuration:
+        </p>
+        <pre>git config --global rebase.autosquash true</pre>
+
         <h2 id="squash">Squashing several commits into one</h2>
         <p>
           As you work, you may find it useful to write lots of commits as you
-- 
2.20.1