fmouhart/blog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more dirty git

Browse Source
This commit is contained in:
Fabrice Mouhartem 2019-04-22 20:57:43 +05:30
parent 1f7393c4cd
commit 7bb74de2c2
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
content/chs-git.md
View File

@ -9,11 +9,27 @@ Header_Cover: images/cover_water.jpg
Some [git](https://git-scm.com/) tricks I use from time to time and that I forgot everytime… Some [git](https://git-scm.com/) tricks I use from time to time and that I forgot everytime…
**Disclaimer:** I'm not the perfect git user, and my way of using it is especially crude.
Recently, most of my git commits are due to [`pass`](/password-store.html), therefore most of those commands are here to fix my mistakes.
Reset `master` to `origin/master`: Reset `master` to `origin/master`:
```sh ```sh
git co origin/master -B master git co origin/master -B master
``` ```
Find back lost commits, especially useful when you are doing dirty things and want to `cherry-pick` an orphan commit (for instance):
```sh
git log --graph --reflog
```
Some explanations: `--graph` show the commit tree, which is useful to notice the orphan leafs, and `--reflog` shows the world all the dirtiness you've done.
If you noticed that your folder grows, you can manually cast the garbage collector on it. It should do it automatically, but not often enough according to my standards.
```sh
git gc --aggressive
```
Another useful trick is `git commit -v`, it allows reviewing your changes before committing. Another useful trick is `git commit -v`, it allows reviewing your changes before committing.
![Example](/examples/git-cv.svg) ![Example](/examples/git-cv.svg)