Git Notes

From PeformIQ Upgrade
Jump to navigation Jump to search

Also see - Git_SCM_Notes | Summary_of_Git_Commands | Getting Started with Git

Branching

  • gitbranch --set-upstream xxx origin/xxx
  • git branch -a
  • git push origin xxx
  • git push origin xxx:yyy
  • git checkout remote/origin/zzz

Low Level Stuff

$ cd .git/reps/heads $ ls $ cat xxx $ cd ../objects/db $ ls

  • git checkout e79ff9e ==> Detached HEAD
  • git branch yesterday e79ff9e5926bd

Remotes

Broadcasting a Local Repo

  • git serve

Reviewing

  • git log --graph --pretty=oneline
  • git log -- ../bin/chk_lrs.py
  • git diff xxx origin/xxx --word-diff
  • git diff master^\^ origin/master --word-diff

After a Conflict

  • git diff
  • git checkout --ours -- the_file
  • git checkout --theirs -- the_file

Other

  • git pull origin +master:master
  • git reset -- HEAD
  • find dir -type f | xargs git reset

List Objects

  • git rev-list --objects -g --no-walk --all


Note, this will discard local changes!


Also see - Git_SCM_Notes | Summary_of_Git_Commands | Getting Started with Git