* Jeff King <peff@xxxxxxxx> wrote:
> On Mon, Jun 23, 2008 at 09:14:41AM +0200, Ingo Molnar wrote:
>
> > Is there a Git way of finding the common ancestor of a topic branch,
> > when compared to upstream?
>
> Try:
>
> git merge-base topic upstream
turns out we already use that as a fallback:
if [ -z "$TREF" ]
then
echo "No topic reference found. Using git-merge-base"
MBASE=`git-merge-base linus HEAD`
TD=`get_date_for_tag`
TB=`echo $B | sed "s@/@-@"`
git-tag "tip-"$TB"-"$TD $MBASE
TREF="tip-"$TB"-"$TD
[...]
i guess we could use that unconditionally.
Ingo
--
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
