diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:14 -0700 |
| commit | 5e97f464df082d8f45e163bbf24341dceeafe89d (patch) | |
| tree | 337339e077105f3b6c1bcc2741dffcaf95f411f1 /ll-merge.c | |
| parent | Merge branch 'js/import-zip' (diff) | |
| parent | Only use GIT_CONFIG in "git config", not other programs (diff) | |
| download | tgif-5e97f464df082d8f45e163bbf24341dceeafe89d.tar.xz | |
Merge branch 'db/no-git-config'
* db/no-git-config:
Only use GIT_CONFIG in "git config", not other programs
Conflicts:
Documentation/RelNotes-1.6.0.txt
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions