m-lamonaca/dev-notes
1
0
Fork 0
mirror of https://github.com/m-lamonaca/dev-notes.git synced 2025-04-06 10:56:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: remove "how to" section and add other comman details

Browse source
This commit is contained in:
Marcello 2022-10-14 22:32:25 +02:00
parent e80a7bf86b
commit cc67107923
1 changed files with 38 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
docs/git/git.md
View file

@ -81,7 +81,10 @@ def load_reference(name_or_id):
## Commands
`git help <command>`: get help for a git command
`git <command> -h`: get help for a git command
`git <command> --help`: get man page for a git command
`git -C <path> <command>`: execute a git commend in the specified path
`git <command> <commit>^`: operate on commit *before* the provided commit hash
### Create Repository
@ -112,6 +115,7 @@ def load_reference(name_or_id):
`git diff <reference_1> <reference_2> <filename>`: show differences in a file between two snapshots
`git diff --cached`: show what is about to be committed
`git diff <first-branch>...<second-branch>`: show content diff between two branches
`git diff -w`: show diff ignoring whitespace differences
`git bisect`: binary search history (e.g. for regressions)
@ -162,6 +166,7 @@ def load_reference(name_or_id):
`git log --oneline`: compact log
`git shortlog`: list commits by author
`git reflog`: show record of when the tips of branches and other references were updated in the local repository
`git show <commit>`: output metadata and content changes of commit
`git cat-file -p <commit>`: output commit metadata
@ -193,6 +198,8 @@ It's generally recommended creating annotated tags so it's possible to have all
### Branching And Merging
![branch](../img/git_branches.png "how branches work")
`git branch`: shows branches
`git branch -vv`: show branch + last commit + remote status
`git branch --merged [--remote]`: show branches (remote) that have been merged into current one (needs same history, merge squash/rebase break history)
@ -207,8 +214,7 @@ It's generally recommended creating annotated tags so it's possible to have all
`git merge <branch-name>`: merges into current branch
`git merge --continue`: continue previous merge after solving a merge conflict
`git mergetool`: use a fancy tool to help resolve merge conflicts
`git rebase`: rebase set of patches onto a new base
`git rebase -i`: interactive rebasing
`git rebase <branch>`: rebase current branch commits onto another branch
`git cherry-pick <commit>`: bring in a commit from another branch
`git cherry-pick <commit>^..<commit>`: bring in a range of commits from another branch (first included)
@ -236,45 +242,4 @@ It's generally recommended creating annotated tags so it's possible to have all
`git rebase -i HEAD~<n>`: modify (reword, edit, drop, squash, merge, ...) *n* commits
`git rebase -i <commit>`: modify (reword, edit, drop, squash, merge, ...) *from* commit to latest
**WARNING**: Changing history can have nasty side effects
---
## How To
### Rebase Branches
```ps1
git checkout <primary_branch>
git pull # get up to date
git checkout <feature_branch>
git rebase <primary_branch> # rebase commits on master (moves branch start point on last master commit)
git checkout <primary_branch>
git rebase <feature_branch> # moves commits from the branch on top of master
```
![branch](../img/git_branches.png "how branches work")
### Clone Branches
```ps1
git clone <repo> # clone the repo
git branch -r # show remote branches
git checkout <branch> # checkout remote branch (omit <remote>/)
git pull # clone branch
```
### [Sync Forks](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/syncing-a-fork)
```ps1
git fetch upstream # Fetch the branches and their respective commits from the upstream repository
git checkout main # checkout fork's main primary branch
git merge upstream/main # Merge the changes from the upstream default branch into the local default branch
git push # update fork on GitHub
```
> **WARN**: Changing history can have nasty side effects