From: Rainer Koenig <Rainer.Koenig@ts.fujitsu.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>
Subject: Re: 2 questions about git and merging
Date: Wed, 27 May 2015 06:55:30 +0200 [thread overview]
Message-ID: <55654E42.8020503@ts.fujitsu.com> (raw)
In-Reply-To: <20150526140427.GO12971@phenom.ffwll.local>
Am 26.05.2015 um 16:04 schrieb Daniel Vetter:
> -nigthly is a rebasing tree, git pull does the wrong thing for that. The
> proper way to track rebasing branches is (assuming you have no local
> patches that you want to keep):
>
> $ git fetch origin
> $ git reset --hard @{upstream}
Thank you for the explanation.
Regards
Rainer
--
Dipl.-Inf. (FH) Rainer Koenig
Project Manager Linux Clients
Dept. PDG WPS R&D SW OSE
Fujitsu Technology Solutions
Bürgermeister-Ullrich-Str. 100
86199 Augsburg
Germany
Telephone: +49-821-804-3321
Telefax: +49-821-804-2131
Mail: mailto:Rainer.Koenig@ts.fujitsu.com
Internet ts.fujtsu.com
Company Details ts.fujitsu.com/imprint.html
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2015-05-27 4:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-26 13:09 2 questions about git and merging Rainer Koenig
2015-05-26 14:04 ` Daniel Vetter
2015-05-26 15:17 ` Jani Nikula
2015-05-27 5:03 ` Rainer Koenig
2015-05-27 5:14 ` Dave Airlie
2015-05-27 6:24 ` Jani Nikula
2015-05-27 9:28 ` Daniel Vetter
2015-05-27 4:55 ` Rainer Koenig [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55654E42.8020503@ts.fujitsu.com \
--to=rainer.koenig@ts.fujitsu.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox