diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-01 14:40:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-01 14:40:37 -0800 |
| commit | 9066f4ef2fe27b7636094c06d2361820cd31e03e (patch) | |
| tree | 9860bdef973ddba13bb9b5d3719ca41f95d7b115 /commit.c | |
| parent | Documentation: remove master:origin example from pull-fetch-param.txt (diff) | |
| parent | Use merge-recursive in git-am -3. (diff) | |
| download | git-9066f4ef2fe27b7636094c06d2361820cd31e03e.tar.gz git-9066f4ef2fe27b7636094c06d2361820cd31e03e.zip | |
Merge branch 'sp/merge' (early part)
* 'sp/merge' (early part):
Use merge-recursive in git-am -3.
Allow merging bare trees in merge-recursive.
Move better_branch_name above get_ref in merge-recursive.
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions