Changes between Version 3 and Version 4 of WorkingConventions/Git/Submodules


Ignore:
Timestamp:
Mar 23, 2014 5:06:53 PM (16 months ago)
Author:
hvr
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions/Git/Submodules

    v3 v4  
    7373}}}
    7474
    75 At this point, the remote `haddock.git` contains newer commits in the `master` brnach, which still need to be registered with `ghc.git`:
     75At this point, the remote `haddock.git` contains newer commits in the `master` branch, which still need to be registered with `ghc.git`:
    7676
    7777{{{#!sh
    78 # if you want, you can inspect with `git submodule` and/or `git status` if there are submodules needing attention;
    79 # specifically, both should report new commits in `util/haddock`
     78# if you want, you can inspect with `git submodule` and/or `git status`
     79# if there are submodules needing attention;
     80# specifically, the commands below should report new commits in `util/haddock`
    8081git submodule
     82git submodule summary
    8183git status
    8284
     
    100102There are server-side validation hooks in place to make sure for non-`wip/` branches that `ghc.git` never points to non-existing commits. Also, as a safe-guard against accidental submodule reference updates, the string `submodule` must occur somewhere in commit messages of commits updating submodule references.
    101103}}}
     104
     105== TODO ==
     106
     107- Describe how to make use of `git submodule update --remote`