Difference between revisions of "Git"

From Useful Things
Jump to: navigation, search
 
Line 37: Line 37:
 
<pre>
 
<pre>
 
git lol
 
git lol
 +
</pre>
 +
 +
== Cache CLI credentials for a certain period of time ==
 +
<pre>
 +
git config --global credential.helper cache
 +
git config --global credential.helper 'cache --timeout=86400'
 
</pre>
 
</pre>

Latest revision as of 05:03, 25 May 2015

Undo last commit and KEEP changes

git reset --soft HEAD~1

Undo last commit and LOSE changes

git reset --hard HEAD~1

List all remote branches

git ls-remote --heads <remote-name>

where remote-name is usually something like origin

Checkout remote branch and set it up for tracking

Note: These instructions are specific to having cloned in this manner: git clone -b <branch-name> --single-branch as it only tracks the branch chosen at clone time.

git fetch origin <branch-name>
git remote set-branches origin <branch-name>

Show contents of merge commit

git show -m [SHA1]

where -m means maximum verbosity, automatically implied only with non-merge commits

View pretty git history on the console

git config --global alias.lol "log --oneline --graph --decorate"
git lol

Cache CLI credentials for a certain period of time

git config --global credential.helper cache
git config --global credential.helper 'cache --timeout=86400'