![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Dec 2010 20:25:28 +0000 (12:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Dec 2010 20:25:28 +0000 (12:25 -0800) |
* mz/pull-rebase-rebased:
Use reflog in 'pull --rebase . foo'
Use reflog in 'pull --rebase . foo'
| 1 | 2 | |||
|---|---|---|---|---|
| git-parse-remote.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-parse-remote.sh
Simple merge