diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-31 16:52:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 16:52:53 -0700 |
| commit | 7f314565fe20e324e8db1a7c233e43ca4e3683f0 (patch) | |
| tree | e548496395a012f6ff7072bb4fb8f5d772a9f07d /builtin-merge-recursive.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | Document sendemail.envelopesender configuration (diff) | |
| download | tgif-7f314565fe20e324e8db1a7c233e43ca4e3683f0.tar.xz | |
Merge branch 'maint'
* maint:
Document sendemail.envelopesender configuration
Document clarification: gitmodules, gitattributes
config.txt: Add missing colons after option name
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions