rebase: allow --merge option to handle patches merged upstream
authorEric Wong <normalperson@yhbt.net>
Sun, 25 Jun 2006 01:29:47 +0000 (18:29 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Jun 2006 07:38:34 +0000 (00:38 -0700)
commit9a99c08...da7cd6b4a41c19df3053542f645315c5
treee639c4f...dc84d047d993722cac034c7c7ddf56e9copy hash to clipboard (tree)
parent29f4ad8...7cd15f4029c280c417f4a0866d5229a9copy hash to clipboard (diff)
git-rebase.sh
t/t3401-rebase-partial.sh