diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-15 11:00:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-15 11:00:24 -0800 |
| commit | d6b634fafdb5570d9c25d5176d3d32fe0b22530d (patch) | |
| tree | 381c0541692cd85a07a6582f8e1e3c238f7bf230 /Documentation/diff-options.txt | |
| parent | f8d186bba72342fed45ed27e89e1bd1179f31545 (diff) | |
| parent | f772c34ce09a49eb553240eb672bf0cc2dbcb10a (diff) | |
| download | git-d6b634fafdb5570d9c25d5176d3d32fe0b22530d.tar.gz git-d6b634fafdb5570d9c25d5176d3d32fe0b22530d.tar.xz | |
Merge branch 'maint'
* maint:
rebase -X: do not clobber strategy
Diffstat (limited to 'Documentation/diff-options.txt')
0 files changed, 0 insertions, 0 deletions