On vr, 2008-08-15 at 13:20 -0500, Jonathan Nieder wrote: Hi, > s/tg/tg redepend/? Yes. > Why not move the base-creation code in tg-create.sh to a new > function in tg.sh to use here? Yes, that's better. > I know I suggested that code before, but the merge with B' is wasted, so > perhaps > > git checkout P > head=$(git rev-parse --verify HEAD^0) > result_tree=$(git log -1 --pretty=format:%T P') > result_commit=$(git commit-tree "$result_tree" -p P -p B') > git update-ref -m "commit (merge): tg-redepend" HEAD \ > "$result_commit" "$head" || ... (fail) > test -x "$GIT_DIR/hooks/post-merge" && $GIT_DIR/hooks/post-merge 0 > > I'm not sure. Is there some more porcelain-ish way to do this (create a > merge commit when you already know the resulting and parents)? > > But with that change the entire restarted=merge branch would go away, > so I hope there is a nice way to do it. I'll think more. Yes, the user should get a nice chance to resolve any conflicts... Thanks! Jan. -- Jan Nieuwenhuizen <janneke@xxxxxxx> | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien | http://www.lilypond.org -- 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
