From: Yann Dirson <ydirson@altern.org>
Date: Sat, 3 Feb 2007 21:29:30 +0000 (+0100)
Subject: Use FETCH_HEAD to know where to rebase to after pull.
X-Git-Tag: v0.12~10
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/57f3e325b9f45dc2c7fd0415bb646179bc37b3bf?ds=inline;hp=57f3e325b9f45dc2c7fd0415bb646179bc37b3bf

Use FETCH_HEAD to know where to rebase to after pull.


Since 'git fetch' already takes care of the branch.*.merge parameters,
resolves the new tip of the parent branch and puts it in FETCH_HEAD,
we're better just taking it from there.

This fixes the regression on t1200-push-modified.sh.

Signed-off-by: Yann Dirson <ydirson@altern.org>
---