diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-10 21:56:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 21:56:43 +0300 |
| commit | e80aae51f2be908e37fca47ea0dff6d7861c8497 (patch) | |
| tree | c6175bbf153532c6757bc637147148a2cf17d381 /merge-recursive.c | |
| parent | 68846a92eafa6b2bfae778d0a656443a9fa61e59 (diff) | |
| parent | 6f6d1f41da7271c04923202dda5ece21a543c927 (diff) | |
Merge branch 'jc/exclusion-doc'
* jc/exclusion-doc:
gitignore: document that unignoring a directory unignores everything in it
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions