{"thread":{"id":"2607","subject":"what is \"rebase\"?","startedAt":"2005-11-19T23:25:14Z","lastAt":"2005-11-20T02:12:27Z","messageCount":5,"participants":["Randal L. Schwartz","Johannes Schindelin","Andreas Ericsson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"12346","messageId":"86fyps8bl1.fsf@blue.stonehenge.com","threadId":"2607","inReplyTo":null,"subject":"what is \"rebase\"?","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2005-11-19T23:25:14Z","receivedAt":"2005-11-19T23:25:14Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":"\nCan someone point me to a simple explanation of what \"rebase\" is?\nThe git-rebase manpage doesn't define the word, or provide an example\nof its use.\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\nSee PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!\n"},{"id":"12349","messageId":"Pine.LNX.4.63.0511200214280.11653@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2607","inReplyTo":"86fyps8bl1.fsf@blue.stonehenge.com","subject":"Re: what is \"rebase\"?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-20T01:15:15Z","receivedAt":"2005-11-20T01:15:15Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 19 Nov 2005, Randal L. Schwartz wrote:\n\n> Can someone point me to a simple explanation of what \"rebase\" is?\n\nHow about the definition in Documentation/glossary.txt?\n\n> rebase::\n> To clean a branch by starting from the head of the main line of\n> development (\"master\"), and reapply the (possibly cherry-picked)\n> changes from that branch.\n\nHth,\nDscho\n"},{"id":"12353","messageId":"86psow6pxl.fsf@blue.stonehenge.com","threadId":"2607","inReplyTo":"Pine.LNX.4.63.0511200214280.11653@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: what is \"rebase\"?","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2005-11-20T01:58:14Z","receivedAt":"2005-11-20T01:58:14Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"Johannes\" == Johannes Schindelin writes:\n\nJohannes> How about the definition in Documentation/glossary.txt?\n\n>> rebase::\n>> To clean a branch by starting from the head of the main line of\n>> development (\"master\"), and reapply the (possibly cherry-picked)\n>> changes from that branch.\n\nWell, I got what I wanted... someone pointing me to a simple explanation.\nHowever, I'm still lost. When would I do this, and what will the\neffect be?\n\nIs this what I would use if I want to discard history except for\nmajor milestones? Like if I had:\n\n A - edit - edit - edit - B - edit - edit - edit - C\n\nand I wanted to really just retain:\n\n A - B - C\n\nOr is this just to make it look like:\n\n C\n\nStill not sure what \"cherry-pick\" is either. And that's *not*\nin the glossary. :)\n\nI'm just worried about my archive getting bigger and bigger and\nhaving lots of junk in it that I can't get rid of.\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\nSee PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!\n"},{"id":"12354","messageId":"86hda86pdu.fsf@blue.stonehenge.com","threadId":"2607","inReplyTo":"86psow6pxl.fsf@blue.stonehenge.com","subject":"Re: what is \"rebase\"?","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2005-11-20T02:10:05Z","receivedAt":"2005-11-20T02:10:05Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"Randal\" == Randal L Schwartz writes:\n\nRandal> Well, I got what I wanted... someone pointing me to a simple explanation.\nRandal> However, I'm still lost. When would I do this, and what will the\nRandal> effect be?\n\nNevermind. Found rebase-from-internal.txt.\n\nI understand much better now.\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\nSee PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!\n"},{"id":"12356","messageId":"437FDB8B.8030707@op5.se","threadId":"2607","inReplyTo":"86psow6pxl.fsf@blue.stonehenge.com","subject":"Re: what is \"rebase\"?","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2005-11-20T02:12:27Z","receivedAt":"2005-11-20T02:12:27Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Randal L. Schwartz wrote:\n> Is this what I would use if I want to discard history except for\n> major milestones?\n> \n\nNo.\n\n> Still not sure what \"cherry-pick\" is either. And that's *not*\n> in the glossary. :)\n> \n\nman git-cherry-pick\n\n> I'm just worried about my archive getting bigger and bigger and\n> having lots of junk in it that I can't get rid of.\n> \n\nIf you do experimental development on a branch and want to throw stuff \naway (commits, tags, whatnot), you should run \"git-reset\". It can bring \nany combination of index and working tree back to any commit in the \nhistory of that branch.\n\n-- \nAndreas Ericsson andreas.ericsson@op5.se\nOP5 AB www.op5.se\nTel: +46 8-230225 Fax: +46 8-230231\n"}]}