chiark / gitweb /
~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 57f3e32)
Use FETCH_HEAD to know where to rebase to after pull. master
authorYann Dirson <ydirson@altern.org>
Sat, 3 Feb 2007 21:29:30 +0000 (22:29 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Sat, 3 Feb 2007 22:15:19 +0000 (22:15 +0000)
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>

No differences found
GIT patch-maintenance porcelain (local modifications)