gEDA-dev: Considering git

[Peter TB Brett]

On Friday 08 June 2007 18:49:26 John Griessen wrote:
> Peter TB Brett wrote:
> >   stg pull origin        # Make sure your patches are up to date w.r.t.
> > main # repository
>
> Is this a merge, but in a patch at a time way?  After this, you test and if
> good, the patches are ready to apply to the equivalent of HEAD/main-branch?

"Usage: stg pull [options] [<repository>]

"Pull the latest changes from the given remote repository (defaulting
to branch.<name>.remote, or 'origin' if not set). This command works
by popping all the patches from the stack, pulling the changes in the
parent repository, setting the base of the stack to the latest parent
HEAD and pushing the patches back (unless '--nopush' is specified).
The 'push' operation can fail if there are conflicts. They need to be
resolved and the patch pushed again."

HTH,

Peter

-- 
Fisher Society                              http://tinyurl.com/o39w2
CU Small-Bore Club                          http://tinyurl.com/mwrc9

      09f911029d74e35bd84156c5635688c0            peter-b.co.uk
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.seul.org/pipermail/geda-dev/attachments/20070608/644fbe0c/attachment.pgp