]> git.xonotic.org Git - xonotic/xonotic.git/commit
properly ignore merges in upstream rebase detection
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 10:40:57 +0000 (12:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 10:40:57 +0000 (12:40 +0200)
commit64e26c2fba740409c370ca95aed0e5cfb1ee59a1
tree4401dd66a5aaf59562dd0a3caf4f0ed63eb59b0a
parentbc28716f920b6c365a834ea0de02962988245773
properly ignore merges in upstream rebase detection
all