diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:04 -0800 |
| commit | ac355298b1bf8ba46aeb4aa7247b470d77ab5631 (patch) | |
| tree | 831eecfad4bb4f2ee34d5b7dbeecc04cae78ce6b /git-merge-one-file.sh | |
| parent | Merge branch 'jc/maint-pull-docfix' (diff) | |
| parent | gitattributes: document more clearly where macros are allowed (diff) | |
| download | tgif-ac355298b1bf8ba46aeb4aa7247b470d77ab5631.tar.xz | |
Merge branch 'mh/attr-macro-doc'
* mh/attr-macro-doc:
gitattributes: document more clearly where macros are allowed
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions