diff options
| author | Avery Pennarun <apenwarr@gmail.com> | 2010-06-24 02:11:04 -0400 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2010-06-24 02:11:04 -0400 |
| commit | 8e770bd389f1810a4b1a53da51e0761ca1435f3a (patch) | |
| tree | 94ab1c47218efd452a4736341cde635ad2f96597 /t/t4013/diff.diff_--stat_initial..side | |
| parent | 9c632ea29ccd58a9967690c2670edec31dc468cd (diff) | |
| parent | 39f5fff0d53bcc68f5c698150d2d3b35eececc27 (diff) | |
| download | git-8e770bd389f1810a4b1a53da51e0761ca1435f3a.tar.gz git-8e770bd389f1810a4b1a53da51e0761ca1435f3a.zip | |
Merge remote branch 'origin/master'
* origin/master:
Fixed regression with splitting out new subtree
Use 'git merge -Xsubtree' when git version >= 1.7.0.
Diffstat (limited to 't/t4013/diff.diff_--stat_initial..side')
0 files changed, 0 insertions, 0 deletions