diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:55:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:55:07 -0800 |
| commit | 424f30a5ae3ff26fca14df71cce31b06d1dec919 (patch) | |
| tree | d4c464ab476a9847fe5f70a747864a0e386020b0 /tree.h | |
| parent | b2dd02112052aff875e8dc7d12b9915c91feafe2 (diff) | |
| parent | c1d7036b6bfea586a30c6eac672e58e22e5ceaf5 (diff) | |
| download | git-424f30a5ae3ff26fca14df71cce31b06d1dec919.tar.gz git-424f30a5ae3ff26fca14df71cce31b06d1dec919.tar.xz | |
Merge branch 'nd/ignore-might-be-precious'
* nd/ignore-might-be-precious:
checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
Diffstat (limited to 'tree.h')
0 files changed, 0 insertions, 0 deletions