[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: Re: Version mismatch when building trunk
From: Matthew Woehlke <mw_triad () users ! sourceforge ! net>
Date: 2009-10-16 21:24:35
Message-ID: hbaoaj$3um$2 () ger ! gmane ! org
[Download RAW message or body]
Andreas Pakulat wrote:
> Well, git-challenged can be easily cured. In fact for keeping track of
> kde-qt you need exactly two very easy to learn commands: git branch and
> git pull. The first one to select the right branch and the latter to
> keep that branch up-to-date.
I think you mean 'git checkout'; 'git branch' *creates* branches, it
does not switch between branches.
...and that's still more than we needed with svn.
My update script doesn't like git repos without a 'master' branch, so I
set up one (locally). Now, is there a way to say that this should track
some "latest" branch upstream so that 'git pull --rebase' will rebase
master less its old upstream onto the new "latest" flavor from upstream?
If yes, that would solve this problem...
--
Matthew
Please do not quote my e-mail address unobfuscated in message bodies.
--
In the GNU/Linux world there are two major text editing programs: the
minimalist vi and the maximalist emacs. I use emacs, which might be
thought of as a thermonuclear word processor. -- Neal Stephenson (from
"In the Beginning was the Command Line")
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic