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)
* 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

1  2 
Documentation/config.txt
Makefile
builtin-archive.c
git-compat-util.h
git.c
refs.c
utf8.c

Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc git.c
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -226,10 -226,9 +226,10 @@@ static void handle_internal_command(in
                { "add", cmd_add, RUN_SETUP | NOT_BARE },
                { "annotate", cmd_annotate, USE_PAGER },
                { "apply", cmd_apply },
-               { "archive", cmd_archive },
+               { "archive", cmd_archive, RUN_SETUP },
                { "blame", cmd_blame, RUN_SETUP },
                { "branch", cmd_branch, RUN_SETUP },
 +              { "bundle", cmd_bundle },
                { "cat-file", cmd_cat_file, RUN_SETUP },
                { "checkout-index", cmd_checkout_index, RUN_SETUP },
                { "check-ref-format", cmd_check_ref_format },
diff --cc refs.c
Simple merge
diff --cc utf8.c
Simple merge