Changes between Version 4 and Version 5 of Chimera2/git

Timestamp:

May 6, 2013, 10:24:33 AM (13 years ago)

Author:

Conrad Huang

Comment:

--

Chimera2/git

@@ -54 +54 @@
 {{{#!html
 <pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
-<b style="color:#c22;">[loft - /e]$ git clone \
+<b style="color:#2a2;">[loft - /e]$ git clone \
   ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/chimera2.git \
   chimera2</b>
@@ -63 +63 @@
 Receiving objects: 100% (556/556), 311.17 MiB | 621 KiB/s, done.
 Resolving deltas: 100% (170/170), done.
-<b style="color:#c22;">[loft - /e]$ cd chimera2</b>
+<b style="color:#2a2;">[loft - /e]$ cd chimera2</b>
 /e/chimera2
-<b style="color:#c22;">[loft - /e/chimera2]$ git flow init -d</b>
+<b style="color:#2a2;">[loft - /e/chimera2]$ git flow init -d</b>
 Using default branch names.
 
@@ -79 +79 @@
 Support branches? [support/]
 Version tag prefix? []
-<b style="color:#c22;">[loft - /e/chimera2]$ ls -l</b>
+<b style="color:#2a2;">[loft - /e/chimera2]$ ls -l</b>
 total 26
 -rw-r--r--+ 1 conrad None  657 May  3 10:51 Makefile
@@ -92 +92 @@
 </pre>
 }}}
+
 == Use ''develop'' Branch Directly for Development ==
+
+For short tasks that one expects to complete before moving on to others, a developer may use the '''develop''' branch (in his own repository) directly, rather than creating a feature branch (see next section).  The example below shows a file being added to the repositories.  Note that modifying a file uses exactly the same steps '''git'''-wise.
+
+A few items of note:
+- the '''add''' command ''__stage__s'' a file, which means that the repository version of the file will be updated ''__with the current contents of the working file__'' at the next '''commit'''.
+- '''git diff''' may be used to compare the working file with either the staged (using no extra arguments) or the committed (using the '''HEAD''' argument) file.
+- files may be reverted to the staged version by using the '''checkout''' command.
+- to unstage a file and return to the committed file, use the '''reset''' command.
+- a '''pull''' is usually done before a '''commit''' so that changes committed by others may be incorporated immediately rather than as part of a ''merge commit''.
+- the '''-a''' flag to '''commit''' is used to stage the latest version of changes before committing.  This is different from '''svn''' where '''commit'''ting a file always commits the latest version.  In '''git''', a '''commit''' commits the version of the file ''__at the time that it was staged__''; subsequent changes will not be committed unless the file is explicitly staged again using the '''add''' command or the '''-a''' flag is specified for the '''commit''' command.
+- the '''-m''' flag to commit specifies a log message for the commit.  To use longer log messages, omit the '''-m''' flag and a text editor (from environment variable '''EDITOR''') will automatically start.
+- the '''commit''' command only updates the local repository.  To make changes visible to other developers, do not forget to '''push''' as well.
+
+{{{#!html
+<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
+<b style="color:#c22;">franklin:myrepo conrad$ pwd</b>
+/usr/local/projects/chimera2/git/myrepo
+<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
+# On branch develop
+nothing to commit (working directory clean)
+<b style="color:#c22;">franklin:myrepo conrad$ echo "hello world" > example</b>
+<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
+# On branch develop
+# Untracked files:
+#   (use "git add &lt;file&gt;..." to include in what will be committed)
+#
+#       example
+nothing added to commit but untracked files present (use "git add" to track)
+<b style="color:#c22;">franklin:myrepo conrad$ git add example</b>
+<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
+# On branch develop
+# Changes to be committed:
+#   (use "git reset HEAD &lt;file&gt;..." to unstage)
+#
+#       new file:   example
+#
+<b style="color:#c22;">franklin:myrepo conrad$ git diff</b>
+<b style="color:#c22;">franklin:myrepo conrad$ echo "hello conrad" > example</b>
+<b style="color:#c22;">franklin:myrepo conrad$ git diff</b>
+diff --git a/example b/example
+index 3b18e51..d21055a 100644
+--- a/example
++++ b/example
+@@ -1 +1 @@
+-hello world
++hello conrad
+<b style="color:#c22;">franklin:myrepo conrad$ git checkout example</b>
+<b style="color:#c22;">franklin:myrepo conrad$ cat example</b>
+hello world
+<b style="color:#c22;">franklin:myrepo conrad$ git diff HEAD</b>
+diff --git a/example b/example
+new file mode 100644
+index 0000000..3b18e51
+--- /dev/null
++++ b/example
+@@ -0,0 +1 @@
++hello world
+<b style="color:#c22;">franklin:myrepo conrad$ echo "hello chimera2" > example</b>
+<b style="color:#c22;">franklin:myrepo conrad$ git diff</b>
+diff --git a/example b/example
+index 3b18e51..addaf36 100644
+--- a/example
++++ b/example
+@@ -1 +1 @@
+-hello world
++hello chimera2
+<b style="color:#c22;">franklin:myrepo conrad$ git pull</b>
+Already up-to-date.
+<b style="color:#c22;">franklin:myrepo conrad$ git commit -a -m "example"</b>
+[develop a3108a9] example
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+ create mode 100644 example
+<b style="color:#c22;">franklin:myrepo conrad$ git push</b>
+Counting objects: 4, done.
+Delta compression using up to 64 threads.
+Compressing objects: 100% (2/2), done.
+Writing objects: 100% (3/3), 278 bytes, done.
+Total 3 (delta 1), reused 0 (delta 0)
+Unpacking objects: 100% (3/3), done.
+To /usr/local/projects/chimera2/git/chimera2.git
+   1d973d7..a3108a9  develop -> develop
+</pre>
+}}}
+
 == Use Feature Branch for Development ==
+
 == Stash Modified Files before Switching Branches ==
+
 == Use plato Repository to Coordinate Development on Multiple Hosts ==