From: Sverre Rabbelier Date: Sun, 25 Jan 2009 15:07:08 GMT Subject: Re: Heads up: major rebase -i -p rework coming up Message-ID: In-Reply-To: Heya, On Sun, Jan 25, 2009 at 15:17, Johannes Schindelin wrote: >> >> merge (B) A # Merge... >> > merge B parent A' # Merge... >> merge B with A' # Merge... > merge B Merge bla/blub > parent A' bla/blub Oh goody, more painting! I was wondering when the next pick-a-word contest would be! -- Cheers, Sverre Rabbelier