Merge branch 'maint'

* maint:
Start preparing for 1.7.4.4
pull: do not clobber untracked files on initial pull
compat: add missing #include <sys/resource.h>

Conflicts:
RelNotes

diff --combined git-compat-util.h
index 49b50eec86828066c90b6165c35ec21cb51e85ce,79b5122b4f75697413b23b45646813bef8705ba9..40498b33c9f09ef9cac1f7340a9a1ceb2ffcd50d
--- 1/git-compat-util.h
--- 2/git-compat-util.h
+++ b/git-compat-util.h
@@@ -118,6 -118,7 +118,7 @@@
  #endif
  #ifndef __MINGW32__
  #include <sys/wait.h>
+ #include <sys/resource.h>
  #include <sys/socket.h>
  #include <sys/ioctl.h>
  #include <termios.h>
@@@ -538,19 -539,6 +539,19 @@@ void git_qsort(void *base, size_t nmemb
  #define fstat_is_reliable() 1
  #endif
  
 +#ifndef va_copy
 +/*
 + * Since an obvious implementation of va_list would be to make it a
 + * pointer into the stack frame, a simple assignment will work on
 + * many systems.  But let's try to be more portable.
 + */
 +#ifdef __va_copy
 +#define va_copy(dst, src) __va_copy(dst, src)
 +#else
 +#define va_copy(dst, src) ((dst) = (src))
 +#endif
 +#endif
 +
  /*
   * Preserves errno, prints a message, but gives no warning for ENOENT.
   * Always returns the return value of unlink(2).