Re: [howto] Kernel hacker's guide to git, updated
From: Linus Torvalds (torvalds_at_osdl.org)
Date: 09/30/05
- Previous message: Shaun Jackman: "Building a 64-bit module on i386"
- In reply to: Junio C Hamano: "Re: [howto] Kernel hacker's guide to git, updated"
- Next in thread: Oliver Neukum: "Re: [howto] Kernel hacker's guide to git, updated"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Fri, 30 Sep 2005 11:14:22 -0700 (PDT) To: Junio C Hamano <junkio@cox.net>
On Fri, 30 Sep 2005, Junio C Hamano wrote:
>
> I suspect the version Linus posted has a funny interaction with
> 'git-pull'; 'git pull --tags' by mistake, or intentionally to
> file a bug report to annoy me ;-), would create an Octopus out
> of those tags, if I am not mistaken.
Hey, even more impressive is "git pull --all", which will happily try to
create an octopus of every single ref available at the other end.
Now, I think that octopus merges in _general_ are likely to be driver
error, and that it might make sense to have a separate flag to enable
them in the first place. That would solve the confusion..
So then you could do
git pull --all --octopus xyzzy
if you _really_ meant to do that.
Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Shaun Jackman: "Building a 64-bit module on i386"
- In reply to: Junio C Hamano: "Re: [howto] Kernel hacker's guide to git, updated"
- Next in thread: Oliver Neukum: "Re: [howto] Kernel hacker's guide to git, updated"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
