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


Ignore:
Timestamp:
05/19/15 14:14:57 (10 years ago)
Author:
Erica Kaminski
Comment:

—

Legend:

Unmodified
Added
Removed
Modified

  • u/erica/GitRepos

    v15 v16  
    8787}}}
    8888
    89 and do a regular diff from the terminal. The commit # is found in
     89and do a regular diff from the terminal, e.g.:
     90
     91{{{
     92diff old.f90 new.f90
     93}}}
     94
     95
     96The commit # is found in
    9097
    9198{{{
    … …  
    93100}}}
    94101
    95 
    96 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).
    97 
    98 To keep track of your changes, you give the command,
    99 
    100 {{{
    101 git status
    102 }}}
    103102
    104103Now, the procedure for pushing changes into the development branch goes as follows. Once your changes are ready to go into the dev branch, you want to switch back to the development branch and update it so that your changes are going to be merged with the ''newest'' version of the dev branch. You do this with,