sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall
- From: Eric Sandall <eric AT sandall.us>
- To: sm-commit AT lists.ibiblio.org
- Subject: Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall
- Date: Sat, 06 May 2006 15:41:12 -0700
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
seth AT swoolley.homeip.net wrote:
> On Sat, May 06, 2006 at 02:42:10PM -0700, Eric Sandall wrote:
>> I am now trying to figure out, since devel is now in sync, how to pull
>> everything in devel (multiple changes) into test, but cherry-pick is
>> only for a single change. I think I need to use `git merge` and list
>> multiple remotes and use the octopus strategy, but I have not tried that
>> yet.
>
> A footnote would have been nice for "the octopus strategy". I presume
> you refer to this:
>
> http://www.schneier.com/blog/archives/2005/03/camouflage_in_o.html
>
> "A species tries different countermeasures at random, and stops at the
> first one that just barely works."
- From `git help octopus`:
octopus
This resolves more than two-head case, but refuses to do
complex
merge that needs manual resolution. It is primarily meant
to be
used for bundling topic branch heads together. This is the
default merge strategy when pulling or merging more than one
branches.
Is what I was going off of.
- -sandalle
- --
Eric Sandall | Source Mage GNU/Linux Developer
eric AT sandall.us | http://www.sourcemage.org/
http://eric.sandall.us/ | SysAdmin @ Shock Physics @ WSU
http://counter.li.org/ #196285 | http://www.shock.wsu.edu/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFEXSYIHXt9dKjv3WERAujzAJ49PXfbLcDgzGp5bKSQQOYYVSgdeQCgvasZ
GZfqgLbkWQog2+jfmuRy6J4=
=OPFt
-----END PGP SIGNATURE-----
-
[SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Eric Sandall, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Arwed von Merkatz, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Eric Sandall, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Arwed von Merkatz, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Eric Sandall, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Arwed von Merkatz, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Eric Sandall, 05/06/2006
- Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall, Arwed von Merkatz, 05/07/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Eric Sandall, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Arwed von Merkatz, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Eric Sandall, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
seth, 05/06/2006
- Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall, Eric Sandall, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Arwed von Merkatz, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Eric Sandall, 05/06/2006
-
Re: [SM-Commit] GIT changes to devel grimoire by Eric Sandall,
Arwed von Merkatz, 05/06/2006
Archive powered by MHonArc 2.6.24.