]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d24ed4 693c15d)
Merge branch 'ew/rebase' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 10:56:41 +0000 (03:56 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 10:56:41 +0000 (03:56 -0700)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.