RFC: git pull or git rebase?

["Michael S. Tsirkin" <mst@dev.mellanox.co.il>]

Hi!
I'm working on several kernel-related projects at the same time:
- some of them are small, and private, so I do a fetch
  and rebase to update to Linus' code, to keep history clean
- some of them are larger, and involve several other people,
  so I do git pull (the history is messy anyway)

Problem is, I get confused sometimes and do a git pull
instead of git rebase, or vice versa. Of course I can just
reset to ORIG_HEAD when I realise my mistake.

However, I wonder whether this happens to others, too.
Would it make sense to add a branch attribute that says
"do not pull this branch" or "do not rebase this branch"?
Maybe even make git do the right thing automatically,
so that git would look at this attribute and perform
pull or rebase as appropriate?

Thanks,

-- 
MST