/github_notes

Notes for github

Github Notes

Notes for github

Windows

To Store credentials

git config --global credential.helper wincred

##Merging Tortoisemert works well git mergetool -t tortoisemerge

Merge config (kdiff3 not as good)

[merge]
        tool = kdiff3
[mergetool "kdiff3"]
        path = c:/Program Files/KDiff3/kdiff3.exe
[diff]
        tool = kdiff3
        guitool = kdiff3
[difftool "kdiff3"]
        path = c:/Program Files/KDiff3/kdiff3.exe

##Get all override local

git fetch --all
git reset --hard origin/master

##Get Updates

git fetch origin
git merge origin/master
    or
git merge origin/yourbranch

##Push to Github

git add *
git commin -m "comment"
git push origin master

##add 'node_modules' to .gitignore file

#add 'node_modules' to .gitignore file

git rm -r --cached node_modules
git commit -m 'Remove the now ignored directory node_modules'
git push origin master