Git pull --rebase - use this instead of normal pull

Git rebase --abort - if something goes wrong in the above cmd

git merge --abort  

git config --list