sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a)
- From: Arwed von Merkatz <v.merkatz AT gmx.net>
- To: sm-commit AT lists.ibiblio.org
- Subject: Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a)
- Date: Thu, 15 May 2008 19:03:00 +0200
On Wed, May 14, 2008 at 02:45:26PM -0700, Eric Sandall wrote:
> On Wednesday, May 14 2008 10:15:57 Arwed von Merkatz wrote:
> > On Tue, May 13, 2008 at 05:01:38PM -0700, Eric K Sandall wrote:
> <snip>
> > > You may need to rebase. I keep my master branch up-to-date with:
> > > $ git fetch
> > > $ git rebase origin
> >
> > There's a shortcut for that:
> > git pull --rebase
>
> Yeah, but `git pull` does all those "merge" commits. :)
Not if run with --rebase, that does exactly what the commands you listed
do :)
--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org
-
[SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a),
George Sherwood, 05/08/2008
-
Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a),
George Sherwood, 05/08/2008
-
Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a),
Eric K Sandall, 05/13/2008
-
Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a),
Arwed von Merkatz, 05/14/2008
-
Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a),
Eric Sandall, 05/14/2008
- Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a), Arwed von Merkatz, 05/15/2008
-
Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a),
Eric Sandall, 05/14/2008
-
Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a),
Arwed von Merkatz, 05/14/2008
-
Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a),
Eric K Sandall, 05/13/2008
-
Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a),
George Sherwood, 05/08/2008
Archive powered by MHonArc 2.6.24.