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 /Documentation | |
| parent | 6f0b4ac0d730c99ab1c2962168675b920febb187 (diff) | |
| parent | 579c9bb1986005282e049c6ad8f594a1ffc35fba (diff) | |
| download | git-9066f4ef2fe27b7636094c06d2361820cd31e03e.tar.gz git-9066f4ef2fe27b7636094c06d2361820cd31e03e.tar.xz | |
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 'Documentation')
0 files changed, 0 insertions, 0 deletions