| commit | bc85b80cd7ba90376be3e21b571477b0b2368ccb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 Apr 2011 20:55:24 +0000 (3 13:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 Apr 2011 20:55:24 +0000 (3 13:55 -0700) | ||
| tree | e62a5aec39ef56c7bbc1cdb337bab1b40a71ace7 | treesnapshot (tar.gz zip) |
| parent | af85f3e9315c2738378c17ca7a5b28dd62daed93 | commitdiff |
| parent | 44bc573436c98b7c6cd798af04c538f6e76f0f6e | commitdiff |
Merge branch 'master' into next
* master:
Start preparing for 1.7.4.4
pull: do not clobber untracked files on initial pull
compat: add missing #include <sys/resource.h>
git.el: Don't use font-lock-compile-keywords
t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT
Fix two unused variable warnings in gcc 4.6
Remove old binaries from .gitignore
sparse: Fix errors and silence warnings
* master:
Start preparing for 1.7.4.4
pull: do not clobber untracked files on initial pull
compat: add missing #include <sys/resource.h>
git.el: Don't use font-lock-compile-keywords
t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT
Fix two unused variable warnings in gcc 4.6
Remove old binaries from .gitignore
sparse: Fix errors and silence warnings
| .gitignore | diff1 | diff2 | blobhistory |
| builtin/grep.c | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |