From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Nov 2008 05:52:28 +0000 (-0800)
Subject: Merge branch 'for-junio' of git://source.winehq.org/~julliard/git/git
X-Git-Tag: v1.6.1-rc1~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f20706220ba788a40b6634255215ccb87accca70;p=git.git

Merge branch 'for-junio' of git://source.winehq.org/~julliard/git/git

* 'for-junio' of git://source.winehq.org/~julliard/git/git:
  git.el: Allow to commit even if there are no marked files.
  git.el: Add possibility to mark files directly in git-update-status-files.
  git.el: Add an insert file command.
  git.el: Never clear the status buffer, only update the files.
  git.el: Fix git-amend-commit to support amending an initial commit.
  git.el: Properly handle merge commits in git-amend-commit.
  git.el: Simplify handling of merge heads in the commit log-edit buffer.
  git.el: Remove the env parameter in git-call-process and git-call-process-string.
  git.el: Improve error handling for commits.
---

f20706220ba788a40b6634255215ccb87accca70