Difference between revisions of "Git cheatsheet"

From Wasya Wiki
Jump to: navigation, search
(see most recent branch)
Line 11: Line 11:
 
What's the latest commit in the branch?
 
What's the latest commit in the branch?
 
  git log -n 1 <branchname> --format=format:%ci
 
  git log -n 1 <branchname> --format=format:%ci
 +
 +
=== list conflicting files ===
 +
git diff --name-only --diff-filter=U

Revision as of 18:23, 2 May 2018

Git cheatsheet - nifty git usage example.

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