Code

Merge branch 'mz/pull-rebase-rebased'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)
commit73fd7f3761eeef0e28bbf04727c8a1e751a9792e
treeee4e1e60de8c67ac5d83148b3880f14bf2d2f024
parent25756cff935b9ef11f429bd5d05aa27045679d52
parentfe249b4219f66ae3aacfac50ad19b38c370ad115
Merge branch 'mz/pull-rebase-rebased'

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