]> source.dussan.org Git - jgit.git/commitdiff
Merge "Proper handling of rebase during pull"
authorChris Aniszczyk <caniszczyk@gmail.com>
Mon, 31 Jan 2011 16:02:57 +0000 (11:02 -0500)
committerCode Review <codereview-daemon@eclipse.org>
Mon, 31 Jan 2011 16:02:57 +0000 (11:02 -0500)

Trivial merge