On 2014-04-14 at 11:13:02 +0200, Simon Peyton Jones wrote: [...]
> # both modified: utils/haddock > The modified files are right. It's the "both modified utils/haddock" that is > messing me up. > I'm not modifying haddock! I just want to say "take the master haddock", but > I don't know how. I tried 'git checkout utils/haddock' but that just led do > `git status' saying > > # modified: utils/haddock (new commits) Fyi, the git equivalent of saying "take the master haddock" (where 'master' refers to 'master' of 'haddock.git'): # checkout master of haddock.git: git submodule update --remote utils/haddock # register state (= submod commit-id) of utils/haddock for next commit git add utils/haddock HTH, hvr _______________________________________________ ghc-devs mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-devs
