projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 514236a 2d33501)
Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 12 Mar 2006 11:29:11 +0000 (03:29 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 12 Mar 2006 11:29:11 +0000 (03:29 -0800)
* master:
  imap-send: Add missing #include for macosx
  git-diff: -p disables rename detection.
  imap-send: cleanup execl() call to use NULL sentinel instead of 0
  annotate.perl triggers rpm bug


Trivial merge
The core git plumbing