Re: git pull on Linux/ACPI release tree

On Mon, 9 Jan 2006, Martin Langhoff wrote:
> 
> and if it does anything but a very trivial merge, backtrack and do a merge.

To be fair, backtracking a "git-rebase" isn't obvious. One of the 
downsides of rebasing.

		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: Junio C Hamano <[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]>

• Prev by Date: RE: git pull on Linux/ACPI release tree
• Next by Date: Re: PROBLEM: PS/2 keyboard does not work with 2.6.15
• 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]