![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 4 Mar 2007 03:47:46 +0000 (19:47 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 4 Mar 2007 03:47:46 +0000 (19:47 -0800) | ||
| commit | 253e772edeb56092e0fad43ec0640658671313c5 | |
| tree | 8e9278a4ac03353056acd765c04779e01b0ce2f9 | tree | snapshot |
| parent | 4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c | commit | diff |
| parent | 7943b3a94f0f862dc9d7dcec6b5639ae5bf027bd | commit | diff |
Merge branch 'maint'
* maint:
Unset NO_C99_FORMAT on Cygwin.
Fix a "pointer type missmatch" warning.
Fix some "comparison is always true/false" warnings.
Fix an "implicit function definition" warning.
Fix a "label defined but unreferenced" warning.
Document the config variable format.suffix
git-merge: fail correctly when we cannot fast forward.
builtin-archive: use RUN_SETUP
Fix git-gc usage note
* maint:
Unset NO_C99_FORMAT on Cygwin.
Fix a "pointer type missmatch" warning.
Fix some "comparison is always true/false" warnings.
Fix an "implicit function definition" warning.
Fix a "label defined but unreferenced" warning.
Document the config variable format.suffix
git-merge: fail correctly when we cannot fast forward.
builtin-archive: use RUN_SETUP
Fix git-gc usage note
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Makefile | diff1 | | diff2 | | blob | history |
| builtin-archive.c | diff1 | | diff2 | | blob | history |
| git-compat-util.h | diff1 | | diff2 | | blob | history |
| git.c | diff1 | | diff2 | | blob | history |
| refs.c | diff1 | | diff2 | | blob | history |
| utf8.c | diff1 | | diff2 | | blob | history |