Git

elijahmanor.com

Fron elijahmanor.com

New user

git config --global user.email "you@example.com"

git config --global user.name "Your Name"

It's cause of Windows end of file (CRLF) conflict with Linux end of file (LF), just update global git core

git config --global core.autocrlf false

And re-clone repository

“Pulling without specifying how to reconcile divergent branches is discouraged”

git config --global pull.ff only

Example to change to vim editor

git config --global core.editor "vim"

git checkout branch_to_erase
git reset --hard branch_to_keep

# local
git branch -d branch_to_delete
# on origin remote
git push origin --delete branch_to_delete

git stash
git checkout other_branch
git stash pop

git reset

git commit -am

git fetch --all

Take master branch to overwrite local

git reset --hard origin/master

With another branch

git reset --hard origin/branch_name