diff options
| author |  Gerrit Pape <pape@smarden.org> | 2008-04-05 16:37:18 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-04-05 12:03:01 -0700 |
| commit | 26ffcb7690139dd53f5deb4f875895f22bebee4f (patch) | |
| tree | adffed20abddc393035be5b35c3cacd2baee3491 /Documentation/merge-strategies.txt | |
| parent | gitweb: fallback to system-wide config file if default config does not exist (diff) | |
| download | tgif-26ffcb7690139dd53f5deb4f875895f22bebee4f.tar.xz | |
gitweb: fallback to system-wide config file (fixup)
The earlier one did not correctly propagate GITWEB_CONFIG_SYSTEM from
Makefile to generated gitweb.cgi script.
Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions