diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 19:54:04 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 19:54:04 -0700 |
commit | c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db (patch) | |
tree | 06ddfc72dff8e370e395a3acc692c8ab48147227 /giteveryday.html | |
parent | d0a9940c76b71c9df840a098a423d3400779d83c (diff) | |
download | git-htmldocs-c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db.tar.gz |
Autogenerated HTML docs for v2.22.0-428-g6d5b2
Diffstat (limited to 'giteveryday.html')
-rw-r--r-- | giteveryday.html | 31 |
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><1></b>
+<pre><code>$ git switch -c alsa-audio <b><1></b>
$ edit/compile/test
-$ git checkout -- curses/ux_audio_oss.c <b><2></b>
+$ git restore curses/ux_audio_oss.c <b><2></b>
$ git add curses/ux_audio_alsa.c <b><3></b>
$ edit/compile/test
$ git diff HEAD <b><4></b>
@@ -891,7 +890,7 @@ $ git commit -a -s <b><5></b> $ edit/compile/test
$ git diff HEAD^ <b><6></b>
$ git commit -a --amend <b><7></b>
-$ git checkout master <b><8></b>
+$ git switch master <b><8></b>
$ git merge alsa-audio <b><9></b>
$ git log --since='3 days ago' <b><10></b>
$ git log v2.43.. curses/ <b><11></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><1></b>
+$ git switch -c mine master <b><1></b>
$ edit/compile/test; git commit -a -s <b><2></b>
$ git format-patch master <b><3></b>
$ git send-email --to="person <email@example.com>" 00*.patch <b><4></b>
-$ git checkout master <b><5></b>
+$ git switch master <b><5></b>
$ git pull <b><6></b>
$ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <b><7></b>
$ git ls-remote --heads http://git.kernel.org/.../jgarzik/libata-dev.git <b><8></b>
@@ -1111,7 +1110,7 @@ satellite$ edit/compile/test/commit satellite$ git push origin <b><4></b>
mothership$ cd frotz
-mothership$ git checkout master
+mothership$ git switch master
mothership$ git merge satellite/master <b><5></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><1></b>
+<pre><code>$ git switch -c private2.6.14 v2.6.14 <b><1></b>
$ edit/compile/test; git commit -a
$ git checkout master
$ git cherry-pick v2.6.14..private2.6.14 <b><2></b></code></pre>
@@ -1243,14 +1242,14 @@ $ mailx <b><3></b> & s 2 3 4 5 ./+to-apply
& s 7 8 ./+hold-linus
& q
-$ git checkout -b topic/one master
+$ git switch -c topic/one master
$ git am -3 -i -s ./+to-apply <b><4></b>
$ compile/test
-$ git checkout -b hold/linus && git am -3 -i -s ./+hold-linus <b><5></b>
-$ git checkout topic/one && git rebase master <b><6></b>
-$ git checkout pu && git reset --hard next <b><7></b>
+$ git switch -c hold/linus && git am -3 -i -s ./+hold-linus <b><5></b>
+$ git switch topic/one && git rebase master <b><6></b>
+$ git switch -C pu next <b><7></b>
$ git merge topic/one topic/two && git merge hold/linus <b><8></b>
-$ git checkout maint
+$ git switch maint
$ git cherry-pick master~4 <b><9></b>
$ compile/test
$ git tag -s -m "GIT 0.99.9x" v0.99.9x <b><10></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>
|