Changes between Version 14 and Version 15 of u/erica/GitRepos

Timestamp:

05/19/15 14:09:43 (10 years ago)

Author:

Erica Kaminski

Comment:

—

u/erica/GitRepos

@@ -76 +76 @@
 
 {{{
-git diff filename prev_revision
+git diff filename HEAD~1 --stats
+}}}
+
+The head~1 is the last committed branch, ~2 is the 2nd to last, etc. Without specifying the pointer (i.e. HEAD), one diffs the uncommitted file with the last committed version by default. Note, that once you commit, you can no longer diff the files by default, and need to specify the pointer. 
+
+Another way you might go about looking at old files, is to use the command
+
+{{{
+git show commit#(or HEAD~1, etc.):filename > "old.f90"
+}}}
+
+and do a regular diff from the terminal. The commit # is found in 
+
+{{{
+git log
 }}}
 
 
-Note, as you go on to make changes to this branch, they will be local until you commit and push those changes back into the central repo. (cf. [https://astrobear.pas.rochester.edu/trac/wiki/DevelopmentProcedure here] for details).
+Now, as you go on to make changes to your branch, they will be local until you commit and push those changes back into the central repo. (cf. [https://astrobear.pas.rochester.edu/trac/wiki/DevelopmentProcedure here] for details).
 
 To keep track of your changes, you give the command,
@@ -95 +109 @@
 }}}
 
-Once you have done this, then you want to merge it with your working branch,
+Once you have done this, you want to switch back to your working branch so that you can merge the development branch into your working branch, rather than the other way around. This effectively changes the tree structure like so:
+
+
 
 {{{
-git merge your_new_branch
+git checkout your_branch
+git merge development
 }}}
 
@@ -108 +125 @@
 
 
-? What about your pushing your ticket branch back into the central repo after it has been merged? Or does command, git push, push *all* of your local repos back into the main repo?
-
-?I think you can only push changes back into the central repo that have been 'checked in', right?
-
-Once you are done with your edits, you can delete your local copies of the repos with,
+Once you are done with your edits, you can delete your local copies of the repo with,
 
 {{{
-git delete
+git branch -d your_branch
 }}}
 
-(although, why is this necessary, can't you just delete your local copies by deleting the whole directory?)
+However, deleting your repo from the central repo is not possible on your own, and you need to ask Jonathan or Baowei to do this for you. Pruning branches should be done with caution. 
 
-and can delete your branch in the central repo with the command,
+As a tip, you can always use the command, 
+
+{{{
+git help command_name
+}}} 
+
+Also as a misc. command, when you are moving files, you should use the command
+
+{{{
+git mv file
+}}}
+
+to track the move.
 
 
+
+