summaryrefslogtreecommitdiffstats
path: root/giteveryday.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-09 19:54:04 -0700
committerJunio C Hamano <gitster@pobox.com>2019-07-09 19:54:04 -0700
commitc9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db (patch)
tree06ddfc72dff8e370e395a3acc692c8ab48147227 /giteveryday.html
parentd0a9940c76b71c9df840a098a423d3400779d83c (diff)
downloadgit-htmldocs-c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db.tar.gz
Autogenerated HTML docs for v2.22.0-428-g6d5b2
Diffstat (limited to 'giteveryday.html')
-rw-r--r--giteveryday.html31
1 files changed, 15 insertions, 16 deletions
diff --git a/giteveryday.html b/giteveryday.html
index d25f8a36c..04c42251b 100644
--- a/giteveryday.html
+++ b/giteveryday.html
@@ -804,7 +804,7 @@ following commands.</p></div>
</li>
<li>
<p>
-<a href="git-checkout.html">git-checkout(1)</a> and <a href="git-branch.html">git-branch(1)</a> to switch
+<a href="git-switch.html">git-switch(1)</a> and <a href="git-branch.html">git-branch(1)</a> to switch
branches.
</p>
</li>
@@ -826,8 +826,7 @@ following commands.</p></div>
</li>
<li>
<p>
-<a href="git-reset.html">git-reset(1)</a> and <a href="git-checkout.html">git-checkout(1)</a> (with
- pathname parameters) to undo changes.
+<a href="git-restore.html">git-restore(1)</a> to undo changes.
</p>
</li>
<li>
@@ -881,9 +880,9 @@ Create a topic branch and develop.
<dd>
<div class="listingblock">
<div class="content">
-<pre><code>$ git checkout -b alsa-audio <b>&lt;1&gt;</b>
+<pre><code>$ git switch -c alsa-audio <b>&lt;1&gt;</b>
$ edit/compile/test
-$ git checkout -- curses/ux_audio_oss.c <b>&lt;2&gt;</b>
+$ git restore curses/ux_audio_oss.c <b>&lt;2&gt;</b>
$ git add curses/ux_audio_alsa.c <b>&lt;3&gt;</b>
$ edit/compile/test
$ git diff HEAD <b>&lt;4&gt;</b>
@@ -891,7 +890,7 @@ $ git commit -a -s <b>&lt;5&gt;</b>
$ edit/compile/test
$ git diff HEAD^ <b>&lt;6&gt;</b>
$ git commit -a --amend <b>&lt;7&gt;</b>
-$ git checkout master <b>&lt;8&gt;</b>
+$ git switch master <b>&lt;8&gt;</b>
$ git merge alsa-audio <b>&lt;9&gt;</b>
$ git log --since='3 days ago' <b>&lt;10&gt;</b>
$ git log v2.43.. curses/ <b>&lt;11&gt;</b></code></pre>
@@ -1018,11 +1017,11 @@ Clone the upstream and work on it. Feed changes to upstream.
<div class="content">
<pre><code>$ git clone git://git.kernel.org/pub/scm/.../torvalds/linux-2.6 my2.6
$ cd my2.6
-$ git checkout -b mine master <b>&lt;1&gt;</b>
+$ git switch -c mine master <b>&lt;1&gt;</b>
$ edit/compile/test; git commit -a -s <b>&lt;2&gt;</b>
$ git format-patch master <b>&lt;3&gt;</b>
$ git send-email --to="person &lt;email@example.com&gt;" 00*.patch <b>&lt;4&gt;</b>
-$ git checkout master <b>&lt;5&gt;</b>
+$ git switch master <b>&lt;5&gt;</b>
$ git pull <b>&lt;6&gt;</b>
$ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <b>&lt;7&gt;</b>
$ git ls-remote --heads http://git.kernel.org/.../jgarzik/libata-dev.git <b>&lt;8&gt;</b>
@@ -1111,7 +1110,7 @@ satellite$ edit/compile/test/commit
satellite$ git push origin <b>&lt;4&gt;</b>
mothership$ cd frotz
-mothership$ git checkout master
+mothership$ git switch master
mothership$ git merge satellite/master <b>&lt;5&gt;</b></code></pre>
</div></div>
<div class="colist arabic"><ol>
@@ -1157,7 +1156,7 @@ Branch off of a specific tag.
<dd>
<div class="listingblock">
<div class="content">
-<pre><code>$ git checkout -b private2.6.14 v2.6.14 <b>&lt;1&gt;</b>
+<pre><code>$ git switch -c private2.6.14 v2.6.14 <b>&lt;1&gt;</b>
$ edit/compile/test; git commit -a
$ git checkout master
$ git cherry-pick v2.6.14..private2.6.14 <b>&lt;2&gt;</b></code></pre>
@@ -1243,14 +1242,14 @@ $ mailx <b>&lt;3&gt;</b>
&amp; s 2 3 4 5 ./+to-apply
&amp; s 7 8 ./+hold-linus
&amp; q
-$ git checkout -b topic/one master
+$ git switch -c topic/one master
$ git am -3 -i -s ./+to-apply <b>&lt;4&gt;</b>
$ compile/test
-$ git checkout -b hold/linus &amp;&amp; git am -3 -i -s ./+hold-linus <b>&lt;5&gt;</b>
-$ git checkout topic/one &amp;&amp; git rebase master <b>&lt;6&gt;</b>
-$ git checkout pu &amp;&amp; git reset --hard next <b>&lt;7&gt;</b>
+$ git switch -c hold/linus &amp;&amp; git am -3 -i -s ./+hold-linus <b>&lt;5&gt;</b>
+$ git switch topic/one &amp;&amp; git rebase master <b>&lt;6&gt;</b>
+$ git switch -C pu next <b>&lt;7&gt;</b>
$ git merge topic/one topic/two &amp;&amp; git merge hold/linus <b>&lt;8&gt;</b>
-$ git checkout maint
+$ git switch maint
$ git cherry-pick master~4 <b>&lt;9&gt;</b>
$ compile/test
$ git tag -s -m "GIT 0.99.9x" v0.99.9x <b>&lt;10&gt;</b>
@@ -1547,7 +1546,7 @@ create and push version tags.
<div id="footer">
<div id="footer-text">
Last updated
- 2018-07-18 13:16:04 PDT
+ 2019-07-09 19:51:04 PDT
</div>
</div>
</body>