<nats`>
I have my commit but in the middle I have commit from upstream
<nats`>
if I rebase/squash I'll squash also ccommit from other people no ?.
<nats`>
wow !
<nats`>
I can simply change order in the commit list when rebasing !
<nats`>
is it true oO
<litghost>
nats: Yes, you can change the order
<litghost>
In order to avoid pulling in other commits, rebase on master first
<nats`>
I'm not sure what that means
<litghost>
Run "git rebase master"
<litghost>
Cleanup any merge conflicts, etc
<litghost>
the run "git rebase -i master"
<litghost>
and squash as needed
<nats`>
uhhhhmmmmm I may have broken something :] I'll reclone a fresh one and apply patch
<litghost>
you can always run "git rebase --abort" if you get lost
<nats`>
uhhhmmmm it's more complicated and I think you'll laugh
<nats`>
I forgot to enter -i
<nats`>
so it did sort of a fast forward rebase
<litghost>
lol, ya
<nats`>
but not really what I planned
<nats`>
I see it in reflog but it's messy
<nats`>
I'll try to make a fresh one
<nats`>
to be honnest git is scary for me
<litghost>
There are resources for getting a better understanding. Git isn't too scary, and once you understand how to use reset/branches to protect yourself, you can basically never lose work
<nats`>
sure now that i participate in a big project with people I'll certainly spend sometime on that topic
<nats`>
I was pretty happy with my svnish use of it when alone
<nats`>
litghost, I think I got myself out of problem but I would like to be careful how should I process, if I push force on my git it can't break anything on master repo ?
<nats`>
proceed
<litghost>
you lack write access to the master repo
<litghost>
In general when force push-ing, specific both the target remote and target branch
<litghost>
e.g. "git push <target remote> <target branch> --force
<nats`>
sure, let's hope github will not play smart and display garbage everywhere like in previous PR :D