Merge branch 'mz/pull-rebase-rebased' into next
commit99c17624986d939fe3c6d4af0c1bb0a1710dd7e9
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:28 +0000 (8 12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:28 +0000 (8 12:25 -0800)
tree61eab3f7139cf4e906c1008b7956eea4d964ba02
parent1869996999a3a250134c04d4e0190bdb860fccbd
parentfe249b4219f66ae3aacfac50ad19b38c370ad115
Merge branch 'mz/pull-rebase-rebased' into next

* mz/pull-rebase-rebased:
  Use reflog in 'pull --rebase . foo'
git-parse-remote.sh