chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c016782) | patch
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)
commit57f3e325b9f45dc2c7fd0415bb646179bc37b3bf
tree63a43ddd10f7bf5e91df44eab2cb090f14ee2648tree | snapshot
parentc0167829ce790a0812f16ae03d1c7c7bd7b14560commit | diff
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>
stgit/commands/pull.py diff | blob | blame | history
stgit/git.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)