Common
|
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 |
git status git add <file> git add . git commit -m 'commit content' git push git pull //Discard unstaged changes git checkout -- <file> git checkout -- . //Check difference between files git diff hello.txt //Merge from branch dev or remote branch origin/testing git merge dev git merge origin/testing //Check difference between last 2 git log -p -2 |
push.default warning
|
1 |
git config --global push.default simple |
Ignored files still display in git status?
|
1 |
git rm --cached <file> |
- Warning! If other users pull this commit, this file will be removed, so remember notify others to backup their files if they need it. e.g. index.php for Codeigniter
- https://stackoverflow.com/questions/1818895/keep-ignored-files-out-of-git-status