Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Sun, 4 Mar 2007 03:47:46 +0000 (19:47 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Mar 2007 03:47:46 +0000 (19:47 -0800)
commit253e772edeb56092e0fad43ec0640658671313c5
tree8e9278a4ac03353056acd765c04779e01b0ce2f9
parent4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c
parent7943b3a94f0f862dc9d7dcec6b5639ae5bf027bd
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
Documentation/config.txt
Makefile
builtin-archive.c
git-compat-util.h
git.c
refs.c
utf8.c