[dmd-internals] shared gitconfig?

[Bernard Helyer]

On 7 January 2013 09:45, Jonathan M Davis <jmdavisProg at gmx.com> wrote:

> On Sunday, January 06, 2013 14:39:11 Andrei Alexandrescu wrote:
> > Hello,
> >
> >
> > I wonder how we can define a few aliases of project-wide usefulness to
> > git. For example, I tried today to get the latest and greatest phobos
> > into my repo, and got a bunch of conflicts. I searched a while on the
> > net to figure what the command for "just get the latest remote into my
> > local copy", which is entirely possible but not obvious and not easy to
> > find. I got it from here: http://goo.gl/pWvVB and the invocation is:
> >
> > git pull --rebase -s recursive -X ours
>

Err, shouldn't

git reset --hard origin/branch-name

work?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.puremagic.com/pipermail/dmd-internals/attachments/20130107/bcf06d08/attachment.html>