Changes between Version 6 and Version 7 of Chimera2/git

Timestamp:

May 6, 2013, 1:22:35 PM (13 years ago)

Author:

Conrad Huang

Comment:

--

Chimera2/git

@@ -256 +256 @@
 To /usr/local/projects/chimera2/git/chimera2.git
    a3108a9..fb5b90a  develop -> develop
-
 </pre>
 }}}
 
 == Stash Modified Files before Switching Branches ==
+
+'''git''' provides a very useful feature where one can save the current state of all working files and return to the committed state.  For example, while working some files, a developer may need to update some other files to fix a bug.  The already changed files are not ready to be committed into the repository, but they should not be discarded either.  Using the '''stash''' command, the developer can
+ - save the current changes,
+ - return to the committed state,
+ - make and commit bug fix changes,
+ - restore the saved changes,
+ - pull back the bug fix changes, and
+ - continue development.
+
+{{{#!html
+<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
+<b style="color:#2a2;">[loft - /e/chimera2]$ pwd</b>
+/e/chimera2
+<b style="color:#2a2;">[loft - /e/chimera2]$ git status</b>
+# On branch develop
+# Changes not staged for commit:
+#   (use "git add &lt;file&gt;..." to update what will be committed)
+#   (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+#
+#       modified:   example
+#
+no changes added to commit (use "git add" and/or "git commit -a")
+<b style="color:#2a2;">[loft - /e/chimera2]$ echo "some changes" > example</b>
+<b style="color:#2a2;">[loft - /e/chimera2]$ git status</b>
+# On branch develop
+# Changes not staged for commit:
+#   (use "git add &lt;file&gt;..." to update what will be committed)
+#   (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+#
+#       modified:   example
+#
+no changes added to commit (use "git add" and/or "git commit -a")
+<b style="color:#2a2;">[loft - /e/chimera2]$ git stash</b>
+Saved working directory and index state WIP on develop: fb5b90a Merge branch 'feature/my_new_feature' into develop
+HEAD is now at fb5b90a Merge branch 'feature/my_new_feature' into develop
+<b style="color:#2a2;">[loft - /e/chimera2]$ cat example</b>
+finished product
+<br/><i><b style="color:#d22;">Here, the developer can make and commit updates without including the earlier changes.</b></i><br/>
+<b style="color:#2a2;">[loft - /e/chimera2]$ git stash list</b>
+stash@{0}: WIP on develop: fb5b90a Merge branch 'feature/my_new_feature' into develop
+<b style="color:#2a2;">[loft - /e/chimera2]$ git stash pop</b>
+# On branch develop
+# Changes not staged for commit:
+#   (use "git add &lt;file&gt;..." to update what will be committed)
+#   (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+#
+#       modified:   example
+#
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (9c7ea9292cd81bd1f4d2606dbab129e3cdd5c0d9)
+<b style="color:#2a2;">[loft - /e/chimera2]$ cat example</b>
+some changes
+<b style="color:#2a2;">[loft - /e/chimera2]$ git pull</b>
+Already up-to-date.
+</pre>
+}}}
 
 == Use plato Repository to Coordinate Development on Multiple Hosts ==