projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07d6893 d5e673b)
Merge branch 'ew/rebase'
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:05:13 +0000 (14:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:05:13 +0000 (14:05 -0700)
* ew/rebase:
  rebase: allow --skip to work with --merge
  rebase: cleanup rebasing with --merge
  rebase: allow --merge option to handle patches merged upstream


Trivial merge
Git—the stupid content tracker