diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-21 03:56:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 03:56:41 -0700 |
| commit | 160a59f326d55970f8a038ef635c662b9c648c75 (patch) | |
| tree | 5b005f53099a7cf02ccf1b784548cce0c7d277c0 /t/t4100-apply-stat.sh | |
| parent | 9d24ed4f019e035eeb8125c2c595876ad1211a3a (diff) | |
| parent | 693c15dc282c36042eac8d215beae3067db7565c (diff) | |
| download | git-160a59f326d55970f8a038ef635c662b9c648c75.tar.gz | |
Merge branch 'ew/rebase' into next
* ew/rebase:
rebase: error out for NO_PYTHON if they use recursive merge
Add renaming-rebase test.
rebase: Allow merge strategies to be used when rebasing
object-refs: avoid division by zero
Diffstat (limited to 't/t4100-apply-stat.sh')
0 files changed, 0 insertions, 0 deletions