workflow - How can I safely use git rebase when working on multiple computers? -

workflow - How can I safely use git rebase when working on multiple computers? -

i work on same project on 2 different computers, desktop , laptop. need transition between them while in middle of task/feature.

so want create commit on laptop, , transport (push/pull) desktop , continue. then, when feature finish want create new commit , crush half-done commit.

how can pull/push laptop without confusing history?

what's proper way of handling this? after doing this, must able publish commits. i'm working on master branch directly, if working on separate branch helps that.

i know how utilize git rebase -i, , have used few times while still on same computer without problem, reply not have include details of git rebase/squash.

i time , utilize next workflow, using github authorative master repository when i'm not sitting @ given computer:

when leave computer always

git force -f

when arrive @ computer do

git fetch -v git reset --hard origin/master # assuming branchname master

as long same, know latest work on github, , rebase want

i set

git config --global push.default current

to force branch have checked out, find mandatory when using lot of forced push.

git workflow squash