Subject: Re: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (110be86beb50cbc2989b7e1fd1c85c97c3a35dab)
Date: Thu, 1 Apr 2010 00:59:53 +0300
Ladislav Hagara suggested devel-gnome-2.30 to be merged with master
spell by spell. That way there will be email for every spell, not just
a huge one. I can't think of a way of doing this without losing commit
history. In master I can do 'git checkout gnome-devel-2.30
gnome2-libs/atk' to pull only atk spell. But the commits from
devel-gnome-2.30 that lead to that state of the spell will not be
present in master.
Here is nice and structured diff of the merge:
[ http://scmweb.sourcemage.org/?p=smgl/grimoire.git;a=commitdiff;h=110be86beb50cbc2989b7e1fd1c85c97c3a35dab;hp=0372d0b0cd608a67bcdf7e40eb9a9c3f6895b643
]