diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-11-29 15:56:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-29 15:56:22 -0800 |
| commit | f24d6b5b23d901f1da0026ce4b3f9c1e1b5e09f6 (patch) | |
| tree | b7d02acc279af5f0473fab19ed00a22415af6ec5 /MyFirstContribution.html | |
| parent | 9e6349aff79ff94450c8aeafac9e6601cf32dced (diff) | |
| download | git-htmldocs-f24d6b5b23d901f1da0026ce4b3f9c1e1b5e09f6.tar.gz | |
Autogenerated HTML docs for v2.34.1-75-gabe6b
Diffstat (limited to 'MyFirstContribution.html')
| -rw-r--r-- | MyFirstContribution.html | 51 |
1 files changed, 41 insertions, 10 deletions
diff --git a/MyFirstContribution.html b/MyFirstContribution.html index ee162ab25..52b348f78 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -1598,16 +1598,47 @@ is out of scope for the context of this tutorial.</p></div> themselves, you’ll need to prepare the patches. Luckily, this is pretty simple:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>$ git format-patch --cover-letter -o psuh/ master..psuh</code></pre>
+<pre><code>$ git format-patch --cover-letter -o psuh/ --base=auto psuh@{u}..psuh</code></pre>
</div></div>
-<div class="paragraph"><p>The <code>--cover-letter</code> parameter tells <code>format-patch</code> to create a cover letter
-template for you. You will need to fill in the template before you’re ready
-to send - but for now, the template will be next to your other patches.</p></div>
-<div class="paragraph"><p>The <code>-o psuh/</code> parameter tells <code>format-patch</code> to place the patch files into a
-directory. This is useful because <code>git send-email</code> can take a directory and
-send out all the patches from there.</p></div>
-<div class="paragraph"><p><code>master..psuh</code> tells <code>format-patch</code> to generate patches for the difference
-between <code>master</code> and <code>psuh</code>. It will make one patch file per commit. After you
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+The <code>--cover-letter</code> option tells <code>format-patch</code> to create a
+ cover letter template for you. You will need to fill in the
+ template before you’re ready to send - but for now, the template
+ will be next to your other patches.
+</p>
+</li>
+<li>
+<p>
+The <code>-o psuh/</code> option tells <code>format-patch</code> to place the patch
+ files into a directory. This is useful because <code>git send-email</code>
+ can take a directory and send out all the patches from there.
+</p>
+</li>
+<li>
+<p>
+The <code>--base=auto</code> option tells the command to record the "base
+ commit", on which the recipient is expected to apply the patch
+ series. The <code>auto</code> value will cause <code>format-patch</code> to compute
+ the base commit automatically, which is the merge base of tip
+ commit of the remote-tracking branch and the specified revision
+ range.
+</p>
+</li>
+<li>
+<p>
+The <code>psuh@{u}..psuh</code> option tells <code>format-patch</code> to generate
+ patches for the commits you created on the <code>psuh</code> branch since it
+ forked from its upstream (which is <code>origin/master</code> if you
+ followed the example in the "Set up your workspace" section). If
+ you are already on the <code>psuh</code> branch, you can just say <code>@{u}</code>,
+ which means "commits on the current branch since it forked from
+ its upstream", which is the same thing.
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>The command will make one patch file per commit. After you
run, you can go have a look at each of the patches with your favorite text
editor and make sure everything looks alright; however, it’s not recommended to
make code fixups via the patch file. It’s a better idea to make the change the
@@ -1930,7 +1961,7 @@ should generate your diffs from <code><topic>..<mybranch></code> and <div id="footer">
<div id="footer-text">
Last updated
- 2021-10-06 14:16:38 PDT
+ 2021-11-29 15:54:03 PST
</div>
</div>
</body>
|