tree f51f4546f505b9387b0b44f0cfeee1ed27217ad0
parent 630fc7878b6fd1bc188d4916b64f4df37658df96
parent 960ac5ff99304404d287b8174d7c8a7743c6d97a
author Junio C Hamano <gitster@pobox.com> 1296152869 -0800
committer Junio C Hamano <gitster@pobox.com> 1296152869 -0800

Merge branch 'maint'

* maint:
  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

Conflicts:
	t/t9300-fast-import.sh