| commit | 1ebd5b5b768789bfacf2655eac1b03824b2363de | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Nov 2011 22:30:53 +0000 (21 14:30 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Nov 2011 22:30:53 +0000 (21 14:30 -0800) | ||
| tree | 66f4107530a6fa13bbe7601b3cc380bc8037016c | treesnapshot (tar.gz zip) |
| parent | 872f25e0cae404f77c22cc7b7412a8575f2f959e | commitdiff |
| parent | e14d63198867c545d0662afc00bf7be048bf2231 | commitdiff |
Merge branch 'master' into next
* master:
convert.c: Fix return type of git_path_check_eol()
documentation fix: git difftool uses diff tools, not merge tools.
config.c: Fix a static buffer overwrite bug by avoiding mkpath()
t5501-*.sh: Fix url passed to clone in setup test
* master:
convert.c: Fix return type of git_path_check_eol()
documentation fix: git difftool uses diff tools, not merge tools.
config.c: Fix a static buffer overwrite bug by avoiding mkpath()
t5501-*.sh: Fix url passed to clone in setup test
| config.c | diff1 | diff2 | blobhistory |