move mv's aside comment to its section
Brent Beer committed
Nov 10, 2015 at 09:42 UTC
1492b3caaab77c51ba8e43e213d9af6658d9654a
1 file changed
+8
-7
basic/index.html
+8
-7
@@ -730,7 +730,7 @@ nothing to commit (working directory clean)
730
dangerous option and is not working directory safe. Any changes not committed will
731
be lost.
732
</p>
733
-
733
+
734
<pre>
735
<b>$ git status</b>
736
# On branch master
@@ -793,6 +793,12 @@ nothing to commit (working directory clean)
793
leave the file in the working directory, you can use <code>git rm --cached
794
</code>.</p>
795
796
+ <p class="aside">
797
+ In its normal form the command is used to delete files.
798
+ But it's often easier to just remove the files off your disk and
799
+ then run <code>git commit -a</code>, which will also automatically remove
800
+ them from your index.</p>
801
+
802
<h4>
803
git mv
804
<small>git rm --cached orig; mv orig new; git add new</small>
@@ -810,11 +816,7 @@ nothing to commit (working directory clean)
816
if it's easier, feel free.
817
</p>
818
813
- <p class="aside">
814
- In its normal form the command is used to delete files.
815
- But it's often easier to just remove the files off your disk and
816
- then run <code>git commit -a</code>, which will also automatically remove
817
- them from your index.</p>
819
+
820
821
<p class="nutshell">
822
<strong>In a nutshell</strong>,
@@ -971,4 +973,3 @@ Dropped stash@{1} (0b1478540189f30fef9804684673907c65865d8f)
973
</div>
974
975
<p><a class="page-button next-page" href="/branching">On to Branching and Merging »</a></p>
974
-