![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 20 Mar 2006 08:51:07 +0000 (00:51 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 20 Mar 2006 08:51:07 +0000 (00:51 -0800) | ||
| commit | e2fc650eefb10bbf98ee782599cd23c7ee6d16de | |
| tree | 16d72b8fbc909514f8c96b9fc06ff6913bd9a342 | tree | snapshot |
| parent | 16563132977287314fa25348d97d0ffbe019442b | commit | diff |
| parent | 6ea23343ce2962a5c76ed62a29fd17cb30954de2 | commit | diff |
Merge branch 'jc/merge' into next
* jc/merge:
git-merge knows some strategies want to skip trivial merges
generate-cmdlist: style cleanups.
Add missing semicolon to sed command.
unpack_delta_entry(): reduce memory footprint.
git.el: Added a function to diff against the other heads in a merge.
git.el: Get the default user name and email from the repository config.
git.el: More robust handling of subprocess errors when returning strings.
* jc/merge:
git-merge knows some strategies want to skip trivial merges
generate-cmdlist: style cleanups.
Add missing semicolon to sed command.
unpack_delta_entry(): reduce memory footprint.
git.el: Added a function to diff against the other heads in a merge.
git.el: Get the default user name and email from the repository config.
git.el: More robust handling of subprocess errors when returning strings.