diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-20 00:51:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-20 00:51:07 -0800 |
| commit | e2fc650eefb10bbf98ee782599cd23c7ee6d16de (patch) | |
| tree | 16d72b8fbc909514f8c96b9fc06ff6913bd9a342 /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | 16563132977287314fa25348d97d0ffbe019442b (diff) | |
| parent | 6ea23343ce2962a5c76ed62a29fd17cb30954de2 (diff) | |
| download | git-e2fc650eefb10bbf98ee782599cd23c7ee6d16de.tar.gz git-e2fc650eefb10bbf98ee782599cd23c7ee6d16de.zip | |
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.
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions