My GIT habits :

• On Windows, through GIT bash

• No UI, except occasional gitk --all& to visually check branches and commits

• Use git fetch then git merge --ff-only origin/master

  • I don't like git pull auto-merging feature that messes up the history

• Use git add -p to :

  • make a quick review of changes before commit
  • try to split changes, and add those which are related in a commit

• When initializing a file, from a generated or copied content :

  • First commit the unmodified version
  • Then commit the changes, can help in the future to spot the differences

• git commit often, in a local branch

• git stash when needed

  • often only when conflicts prevents switching branch

• git tag when delivering