author | Junio C Hamano <gitster@pobox.com> | |
Mon, 15 Nov 2010 19:00:24 +0000 (11:00 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 15 Nov 2010 19:00:24 +0000 (11:00 -0800) |
* maint:
rebase -X: do not clobber strategy
rebase -X: do not clobber strategy
Trivial merge