Merge branch 'maint' into tj/imap-send-remove-unused
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Nov 2011 21:28:53 +0000 (13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Nov 2011 21:28:53 +0000 (13:28 -0800)
* maint: (18123 commits)
documentation fix: git difftool uses diff tools, not merge tools.
Git 1.7.7.4
Makefile: add missing header file dependencies
notes merge: eliminate OUTPUT macro
mailmap: xcalloc mailmap_info
name-rev --all: do not even attempt to describe non-commit object
Git 1.7.7.3
docs: Update install-doc-quick
docs: don't mention --quiet or --exit-code in git-log(1)
Git 1.7.7.2
t7511: avoid use of reserved filename on Windows.
clone: Quote user supplied path in a single quote pair
read-cache.c: fix index memory allocation
make the sample pre-commit hook script reject names with newlines, too
Reindent closing bracket using tab instead of spaces
Git 1.7.7.1
RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting
gitweb: fix regression when filtering out forks
Almost ready for 1.7.7.1
pack-objects: don't traverse objects unnecessarily
...

Conflicts:
imap-send.c

imap-send.c
index e1ad1a48ce3b8bd8517568a67477d8d0e32dfaa8..80e0e8c051ad26a3a1353a4beb21e5c6ebdd6823 100644 (file)
@@ -161,7 +161,6 @@ static struct imap_server_conf server = {
 struct imap_store_conf {
        struct store_conf gen;
        struct imap_server_conf *server;
-       unsigned use_namespace:1;
 };
 
 #define NIL    (void *)0x1