yoshie
/
til
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

better git

main
hau 2020-08-20 16:41:51 +07:00
parent ff330d8230
commit c4831ab45f
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Applications/Essential/git.md
View File

@ -11,13 +11,12 @@ git config --global alias.co checkout
git config --global alias.df diff git config --global alias.df diff
git config --global alias.st status git config --global alias.st status
git config --global alias.sw switch git config --global alias.sw switch
git config --global alias.logo 'log --pretty=oneline'
``` ```
Use neovim when commit: Use nice editor when commit:
```sh ```sh
git config --global core.editor nvim git config --global core.editor <editor>
``` ```
## Commands ## Commands
@ -43,13 +42,13 @@ git push --force-with-lease
Rewrite history by changing last `x` commits : Rewrite history by changing last `x` commits :
```sh ```sh
git rebase -i HEAD~x git rebase -i HEAD~<x>
``` ```
Squash last `x` commits to 1 commit: Squash last `x` commits to 1 commit:
```sh ```sh
git reset HEAD~x git reset HEAD~<x>
git add -A git add -A
git commit git commit
``` ```
@ -63,5 +62,19 @@ git gc
Find common ancestor: Find common ancestor:
```sh ```sh
git merge-base A B git merge-base <A> <B>
```
Log:
```
git log --pretty=oneline
git log --graph --pretty=oneline
git log --date=human
```
Changelog:
```
git shortlog <commit>..HEAD
``` ```