Changes between Version 6 and Version 7 of GitTips

Timestamp:

03/26/2010 06:14:47 PM (14 years ago)

Author:

andar

Comment:

--

GitTips

@@ -45 +45 @@
 git update-index --no-assume-unchanged <ignored-tracked-file>
 }}}
+
+== Stashing untracked files ==
+
+At times you will be working on a branch with untracked files (new files) and you'll need to checkout master to apply a bug fix.
+
+First, add the untracked files to the index:
+{{{
+#!sh
+git add <untracked-files>
+}}}
+
+Now do a regular stash:
+{{{
+#!sh
+git stash
+}}}
+
+At this point you can checkout whatever branch you want and do what you need to do.  When you're done, checkout your original working branch again and pop the changes from your stash:
+
+{{{
+#!sh
+git stash pop
+}}}
+
+You can remove the files you indexed from the index if you want, as to not pollute your next commit:
+{{{
+#!sh
+git rm --cached <files>
+}}}