author | Junio C Hamano <gitster@pobox.com> | |
Wed, 26 Nov 2008 05:52:28 +0000 (21:52 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 26 Nov 2008 05:52:28 +0000 (21:52 -0800) | ||
commit | f20706220ba788a40b6634255215ccb87accca70 | |
tree | a0f8457ddc0beb66d2596a98a6f4e1fa7cbb7c7f | tree | snapshot |
parent | ef3b38b445c183b2a07a6360de62908d312ade0f | commit | diff |
parent | 1905a8666a676f7070ba15c6f56f98bb1da20f7b | commit | diff |
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.
* '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.