Difference between revisions of "Git cheatsheet"

From Wasya Wiki
Jump to: navigation, search
Line 1: Line 1:
  
 
Git cheatsheet - nifty git usage example.
 
Git cheatsheet - nifty git usage example.
 +
 +
=== show history for a file ===
 +
git log --follow -p -- file
  
 
=== check branch ===
 
=== check branch ===

Revision as of 21:36, 17 July 2018

Git cheatsheet - nifty git usage example.

show history for a file

git log --follow -p -- file

check branch

git branch | grep -e "^*" | cut -d' ' -f 2

see most recent branch

git branch -a --sort=-committerdate
git branch -a --sort=committerdate

What's the latest commit in the branch?

git log -n 1 <branchname> --format=format:%ci

list conflicting files

git diff --name-only --diff-filter=U