Difference between revisions of "Git"
From neil.tappsville.com
Jump to navigationJump to searchm |
m |
||
Line 5: | Line 5: | ||
git diff origin/master..HEAD | git diff origin/master..HEAD | ||
− | Diff between the current branch and develop (origin of this branch hopefully) | + | Diff between the current branch and develop (origin of this branch hopefully) aka diff source and then current branch |
− | git diff feature/[branch_name] | + | git diff develop..feature/[branch_name] |
Revision as of 22:12, 2 October 2019
Local Changes vs Repo
git log origin/master..HEAD
You can also view the diff using the same syntax
git diff origin/master..HEAD
Diff between the current branch and develop (origin of this branch hopefully) aka diff source and then current branch
git diff develop..feature/[branch_name]
Wipe all local changes and get the latest from the repo
git reset --hard or git checkout -- <file name> git rebase origin/master
Or to store changes and re-apply them after pulling
git stash git pull git stash pop