Hi, On Sun, 25 Jan 2009, Sverre Rabbelier wrote: > On Sun, Jan 25, 2009 at 15:17, Johannes Schindelin > <Johannes.Schindelin@xxxxxx> 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! In this case, it is not about painting. I will gladly ignore all those who think they must submit a new word for this action. The thing is: I want the command to be intuitive, so I need a syntax where even the most idiotic dullard will understand what are the parents, and why we need the original merge's commit name, too. So maybe I answered my question myself: merge parents $sha1 [$sha1...] original $sha1 $msg Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
