Changes between Version 19 and Version 20 of WorkingConventions/GitSPJ


Ignore:
Timestamp:
Apr 17, 2014 7:49:31 AM (11 months ago)
Author:
simonpj
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions/GitSPJ

    v19 v20  
    22 
    33Here are notes about using Git that Simon PJ has found useful. 
     4 
     5----------------------------- 
     6== Understanding the model == 
     7 
     8=== Submodules === 
     9 
     10See [wiki:WorkingConventions/Git/Submodules] for the GHC specific stuff. 
     11 
     12Suppose you have a submodule `utils/haddock` in the main GHC repo. 
     13 
     14 * The submodule `utils/haddock` is a full-on, independent Git repo 
     15 
     16 * You should think of the GHC repo as having a file that contains the commit-id (e.g. `ac60bd1`) for the `utils/haddock` repo.  That's ''all'' that the GHC repo remembers about the `utils/haddock` repo.  But it means that the GHC repo knows the exact state of the `utils/haddock` repo that matches the state of the GHC repo. 
     17 
     18 * In the GHC repo, `git submodule update utils/haddock` checks out the `utils/haddock` repo to match the GHC repo's recorded commit-id (in this case `ac60bd1`).  If you do this for all submodules, they'll all line up with a particular state of the GHC repo. 
     19 
    420 
    521------------------------------