deploy: dc5d08c

Author: egrace479

search/search_index.json

@@ -923,13 +923,13 @@
     <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
 
         <li class="md-nav__item">
-  <a href="#useful-bash-emacs-and-git" class="md-nav__link">
+  <a href="#useful-bash-and-git" class="md-nav__link">
     <span class="md-ellipsis">
-      Useful bash, emacs, and git:
+      Useful bash and git
     </span>
   </a>
 
-    <nav class="md-nav" aria-label="Useful bash, emacs, and git:">
+    <nav class="md-nav" aria-label="Useful bash and git">
       <ul class="md-nav__list">
 
           <li class="md-nav__item">
@@ -1168,13 +1168,13 @@
     <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
 
         <li class="md-nav__item">
-  <a href="#useful-bash-emacs-and-git" class="md-nav__link">
+  <a href="#useful-bash-and-git" class="md-nav__link">
     <span class="md-ellipsis">
-      Useful bash, emacs, and git:
+      Useful bash and git
     </span>
   </a>
 
-    <nav class="md-nav" aria-label="Useful bash, emacs, and git:">
+    <nav class="md-nav" aria-label="Useful bash and git">
       <ul class="md-nav__list">
 
           <li class="md-nav__item">
@@ -1234,7 +1234,7 @@
 
 <h1 id="command-line-cheat-sheet">Command Line Cheat Sheet<a class="headerlink" href="#command-line-cheat-sheet" title="Permanent link">&para;</a></h1>
 <p>See also <a href="https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax">GitHub's Markdown Guide</a>.</p>
-<h2 id="useful-bash-emacs-and-git">Useful bash, emacs, and git:<a class="headerlink" href="#useful-bash-emacs-and-git" title="Permanent link">&para;</a></h2>
+<h2 id="useful-bash-and-git">Useful bash and git<a class="headerlink" href="#useful-bash-and-git" title="Permanent link">&para;</a></h2>
 <table>
 <thead>
 <tr>
@@ -1332,6 +1332,13 @@ <h3 id="git-specific">Git-Specific<a class="headerlink" href="#git-specific" tit
 </tr>
 </tbody>
 </table>
+<div class="admonition tip">
+<p class="admonition-title">Pro tip: Simplify your git history</p>
+<ul>
+<li>Use <code>git mv</code> to rename a file so that it is tracked as a rename (with or without changes). </li>
+<li>If you rename a file then <code>git add</code> its parent directory, the diff will show the deletion of the original file and addition of a "completely new" file, even if nothing has changed. This makes reviewing changes much more complicated than necessary.</li>
+</ul>
+</div>
 <h4 id="usual-process">Usual Process<a class="headerlink" href="#usual-process" title="Permanent link">&para;</a></h4>
 <p>After making changes to a file on a branch, check the status of your current working branch (with <code>git status</code>). Then, you "add" the file, state what is new about the file ("commit the change"), and <code>push</code> the file from your local copy of the repo to the remote copy:</p>
 <div class="language-bash highlight"><pre><span></span><code><span id="__span-0-1"><a id="__codelineno-0-1" name="__codelineno-0-1" href="#__codelineno-0-1"></a>git<span class="w"> </span>add<span class="w"> </span>&lt;filename&gt;
@@ -1340,6 +1347,10 @@ <h4 id="usual-process">Usual Process<a class="headerlink" href="#usual-process"
 </span><span id="__span-0-4"><a id="__codelineno-0-4" name="__codelineno-0-4" href="#__codelineno-0-4"></a>
 </span><span id="__span-0-5"><a id="__codelineno-0-5" name="__codelineno-0-5" href="#__codelineno-0-5"></a>git<span class="w"> </span>push
 </span></code></pre></div>
+<div class="admonition tip">
+<p class="admonition-title">Pro tip: Check the stage</p>
+<p>After using <code>git add &lt;folder&gt;</code> or <code>git add &lt;regex&gt;</code> (a pattern match), run <code>git status</code> to ensure that all intended files--and <strong><em>only</em></strong> intended files--are staged for commit.</p>
+</div>
 <div class="admonition note note">
 <p class="admonition-title">Note</p>
 <p>If you need to update your branch with changes from the remote <code>main</code>, first switch to the branch, then set pull from <code>main</code> instead of the current branch, as below.