From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jan 2011 20:14:45 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2af8b5ddaca41f133732c779b38f508de3af94b1;p=git.git

Merge branch 'master' into next

* master:
  Don't pass "--xhtml" to hightlight in gitweb.perl script.
  rebase -i: clarify in-editor documentation of "exec"
  tests: sanitize more git environment variables
  fast-import: treat filemodify with empty tree as delete
  rebase: give a better error message for bogus branch
  rebase: use explicit "--" with checkout
---

2af8b5ddaca41f133732c779b38f508de3af94b1