Sync with 1.7.7.4

diff --cc Makefile
index ee34eab8c527da360a24c153a297d7a2f62d2a55,5dbe4f7908fa9aabb7726756f10d2c16894432d0..34ac795783a1daf5574a914d91733fb8202289cf
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -515,9 -519,9 +515,10 @@@ LIB_H += compat/mingw.
  LIB_H += compat/obstack.h
  LIB_H += compat/win32/pthread.h
  LIB_H += compat/win32/syslog.h
 -LIB_H += compat/win32/sys/poll.h
 +LIB_H += compat/win32/poll.h
  LIB_H += compat/win32/dirent.h
 +LIB_H += connected.h
+ LIB_H += convert.h
  LIB_H += csum-file.h
  LIB_H += decorate.h
  LIB_H += delta.h

diff --cc builtin/name-rev.c
Simple merge

diff --cc notes-merge.c
Simple merge