[pymvpa] /Developers only/ GIT repository/clones restructuring/migration

Yaroslav Halchenko debian at onerussian.com
Sun Aug 15 02:03:26 UTC 2010


On Thu, 12 Aug 2010, Valentin Haenel wrote:
> > diff M...B
> I am not sure i understand. M...B shows all commits reachable from M and B, but
> not from both.
no -- that should show differences introduced in B on top of M (mention
number of the dots)

> > git merge --no-commit M
> > # verifying that no conflicts present
> > git reset --hard

> Do you mean git merge --no-commit B, i.e. merging B into M, or the other way
> round?
either way ;-)

-- 
                                  .-.
=------------------------------   /v\  ----------------------------=
Keep in touch                    // \\     (yoh@|www.)onerussian.com
Yaroslav Halchenko              /(   )\               ICQ#: 60653192
                   Linux User    ^^-^^    [175555]





More information about the Pkg-ExpPsy-PyMVPA mailing list