Re: git pull on Linux/ACPI release tree


On Sun, 8 Jan 2006, Junio C Hamano wrote:
> 
> Careful.  I do not think rebase works across merges at all.

Right. You have to do one or the other (rebase your changes to another 
tree _or_ merge another tree into your changes), but not mix the two.

		Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Follow-Ups:
- Re: git pull on Linux/ACPI release tree
  - From: Tony Luck <[email protected]>

References:
- RE: git pull on Linux/ACPI release tree
  - From: "Brown, Len" <[email protected]>
- Re: git pull on Linux/ACPI release tree
  - From: Martin Langhoff <[email protected]>
- Re: git pull on Linux/ACPI release tree
  - From: Junio C Hamano <[email protected]>

Prev by Date: Re: git pull on Linux/ACPI release tree
Next by Date: Re: [rfc][patch] Avoid taking global tasklist_lock for single threadedprocess at getrusage()
Previous by thread: Re: git pull on Linux/ACPI release tree
Next by thread: Re: git pull on Linux/ACPI release tree
Index(es):
- Date
- Thread

[Index of Archives] [Kernel Newbies] [Netfilter] [Bugtraq] [Photo] [Stuff] [Gimp] [Yosemite News] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Video 4 Linux] [Linux for the blind] [Linux Resources]