On Thu, Nov 17, 2016 at 09:11:48PM +0300, Konstantin Khomoutov wrote: > On Thu, 17 Nov 2016 11:25:17 -0500 > Fleetwood Farm <[email protected]> wrote: > > [...] > > I believe I am understanding it better already. I will need to reread > > it a few more times, and your provided links, to digest it all, but > > think I can see land through the fog now. I am never going to push my > > edits upstream as I just send email patches to be incorporated or not > > as deemed by the maintainer. > > I would then pick rebasing as the strategy to maintain your local > changes. > This is what I was thinking might be my best bet too.
> > BTW, I branched my local style off of the cloned staging-testing. > > I might not understand your terminology, but > > 1) You can't clone just a single branch. > Git always clones full repositories. > > (Well, except when you perform a so-called "shallow" clone > and explicitly tell Git which branch to consider to be of > interest. This is an advanced topic, to a degree.) > > 2) You can't fork a branch off the whole repository: any branch > either starts being orhpan, which is really a special case, > or it initially points to some existing commit -- 99.99% of all > the normal cases. > > Considering this, what do you call "staging-testing" -- a repository or > a branch in the cloned repository? > I am thinking 'staging-testing' is a local copy of the remote repository. I used 'git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git' then make the branch 'style' based on that by using 'git checkout -b style' The way I see it working, everything I do in 'style' is compared to 'staging-testing' which should be an exact copy of the remote repository. I don't make any changes to 'staging-testing' other than updating it from the remote. Once 'staging-testing' is updated I would then rebase 'style' > > I will respond back later with what I think may be my best course of > > action after further reading and thinking. > > Sure, feel free to ask away for more details where needed. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
