{"thread":{"id":"12848","subject":"git-rebase: \"Patch is empty. Was it split wrong?\"","startedAt":"2008-03-24T20:11:13Z","lastAt":"2008-03-24T20:11:13Z","messageCount":1,"participants":["Deepak Saxena"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"72946","messageId":"20080324201113.GA15153@plexity.net","threadId":"12848","inReplyTo":null,"subject":"git-rebase: \"Patch is empty. Was it split wrong?\"","fromName":"Deepak Saxena","fromEmail":"dsaxena@plexity.net","sentAt":"2008-03-24T20:11:13Z","receivedAt":"2008-03-24T20:11:13Z","isPatch":false,"sender":{"key":"dsaxena@plexity.net","avatar":null},"body":"I'm getting the above message when doing a git-rebase and wondering\nis is due to user error in how I am using rebase or b/c of something\nelse.\n\nMy situation is that a I have a main branch \"dev\", against which\nothers have developed some branches and I merge into my local\nversion of dev. After merging these I want to rebase to remove the\nmerge itself from the history (I need to linearize the history, \nlong story, don't ask why):\n\n$ git-checkout -b f2.6.24_dev f2.6.24/dev\nBranch f2.6.24_dev set up to track remote branch refs/remotes/f2.6.24/dev.\nSwitched to a new branch \"f2.6.24_dev\"\n$ git-merge 27234_v01 27470_v01 27476_v01\nTrying simple merge with bdc5878e45152a11c9a434bd4e0a07ddf98434be\nTrying simple merge with 2d03ed92eecb9bde8402957d9e801d9055dbcef4\nTrying simple merge with af38b4a114b3380cdc7c426b912ede1e4e023b74\nMerge made by octopus.\n....\n 22 files changed, 2407 insertions(+), 150 deletions(-)\n create mode 100644 include/linux/mroute6.h\n create mode 100644 include/linux/pim.h\n create mode 100644 net/ipv6/ip6mr.c\n$ git-log --pretty=oneline f2.6.24/dev..\n96f76db4b03413f0ec14c6d45f19cbf1398dd7b7 Merge branches '27234_v01', '27470_v01' and '27476_v01' into f2.6.\nbdc5878e45152a11c9a434bd4e0a07ddf98434be [IPV6] Add support for IPv6 multicast forwarding\naf38b4a114b3380cdc7c426b912ede1e4e023b74 ARM: OMAP: NAND: update platform data\nc17782dc688990e1971ae94c99476cbc529a04de ARM: OMAP: NAND: update Kconfig and default defconfig\n10fab40c623ae6d71bbda94de61088dab88859e4 ARM: OMAP: NAND: logic for detecting the flash device\n4e1c857c6256967da11ecc0f147b87f4d5613e4e ARM: OMAP: NAND: code documentation cleanup\n33ae04c1febef4de882c6b65ec6c50d72e3f0d34 ARM: OMAP: NAND: 8/16 bit, large/small page, HWECC/SWECC support\n2d03ed92eecb9bde8402957d9e801d9055dbcef4 sched: fix oops in root-domain code during repartitioning\n$ git-rebase f2.6.24/dev\nFirst, rewinding head to replay your work on top of it...\nHEAD is now at 325943d... Make RT73 config more consistant with other drivers\nPatch is empty.  Was it split wrong?\n\nAm I just abusing git-rebase here or is there something wrong with my tree?\n\nVersion is 1.5.4.4.\n\nThanks,\n~Deepak\n\n\n-- \n   _____   __o  Deepak Saxena - Living CarFree and CareFree            (o>\n------    -\\<,  Towards Carfree Cities 2008 - www.carfreeportland.org  //\\\n ----- ( )/ ( ) Linux Plumber's Conference - www.linuxplumbersconf.org V_/_\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"}]}