![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) | ||
| commit | d6b634fafdb5570d9c25d5176d3d32fe0b22530d | |
| tree | 381c0541692cd85a07a6582f8e1e3c238f7bf230 | tree | snapshot |
| parent | f8d186bba72342fed45ed27e89e1bd1179f31545 | commit | diff |
| parent | f772c34ce09a49eb553240eb672bf0cc2dbcb10a | commit | diff |
Merge branch 'maint'
* maint:
rebase -X: do not clobber strategy
* maint:
rebase -X: do not clobber strategy