Difference between revisions of "Git"

Revision as of 22:09, 2 October 2019

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)

git diff feature/[branch_name]..develop

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

Revision as of 22:08, 2 October 2019 (view source) Gonzo (talk \| contribs) m ← Older edit		Revision as of 22:09, 2 October 2019 (view source) Gonzo (talk \| contribs) m Newer edit →
Line 6:		Line 6:

	Diff between the current branch and develop (origin of this branch hopefully)		Diff between the current branch and develop (origin of this branch hopefully)
−	git diff feature/~~radius_kap-bng_IPS~~..develop	+	git diff feature/[branch_name]..develop