псы в рапиде » from archive
Rebasing and merging: some git best practices [LWN.net] - http://lwn.net/Articles/328436/