Difference between revisions of "Git Notes"
Jump to navigation
Jump to search
PeterHarding (talk | contribs) |
PeterHarding (talk | contribs) |
||
| (2 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
Also see - [[Git_SCM_Notes]] | Also see - [[Git_SCM_Notes]] | [[Summary_of_Git_Commands]] | [[Getting Started with Git]] | ||
=Branching= | =Branching= | ||
| Line 51: | Line 51: | ||
* git reset -- HEAD | * git reset -- HEAD | ||
* find dir -type f | xargs git reset | * find dir -type f | xargs git reset | ||
==List Objects== | |||
* git rev-list --objects -g --no-walk --all | |||
| Line 56: | Line 60: | ||
Also see - [[Git_SCM_Notes]] | Also see - [[Git_SCM_Notes]] | [[Summary_of_Git_Commands]] | [[Getting Started with Git]] | ||
[[Category:Git]] | [[Category:Git]] | ||
[[Category:SCM]] | [[Category:SCM]] | ||
Latest revision as of 23:18, 3 November 2020
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
- git remote -v
- git remote another [1]
- git remote add tim git://xxxxx@xxxx.com/xxx/repo.git
- git fetch originhttps
- git fetch
- git diff xxx origin/xxx
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