Ask HN: do you git merge or git rebase?

		Ask HN: do you git merge or git rebase?
		1 point by ddalex on March 13, 2014 \| hide \| past \| favorite
		I realize that the kernel folks use git merge but it seems saner, to me, to use git rebase to bring upstream changes on local trees. What do you prefer, and why ?