fix linting
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
vincent 2021-06-04 10:27:21 +02:00
parent e1a28cedfe
commit 24fd05573f
2 changed files with 12 additions and 16 deletions

View File

@ -2,11 +2,10 @@
> Se vouloir libre, c'est aussi vouloir les autres libres > Se vouloir libre, c'est aussi vouloir les autres libres
simone de beauvoir simone de beauvoir
>Les ordinateurs ne sont pas le truc. Ils sont le truc qui nous conduit au truc > Les ordinateurs ne sont pas le truc. Ils sont le truc qui nous conduit au truc
Halte and catch fire Halte and catch fire
> La vie trouve toujours son chemin > La vie trouve toujours son chemin

View File

@ -4,7 +4,7 @@
## Clone with submodule recurse ## Clone with submodule recurse
add *--recurse-submodules* to clone command add _--recurse-submodules_ to clone command
## Add in staging only a part of modification done in a file ## Add in staging only a part of modification done in a file
@ -12,11 +12,11 @@ add *--recurse-submodules* to clone command
this will ask if you want to add each modification with this option: this will ask if you want to add each modification with this option:
- *y* - Yes, add this hunk - _y_ - Yes, add this hunk
- *n* - No, dont add this hunk - _n_ - No, dont add this hunk
- *d* - No, dont add this hunk and all other remaining hunks. Useful if youve already added what you want to, and want to skip over the rest - _d_ - No, dont add this hunk and all other remaining hunks. Useful if youve already added what you want to, and want to skip over the rest
- *s* - Split the hunk into smaller hunks. This only works if theres unchanged lines between the changes in the displayed hunk, so this wouldnt have any effect in the example above - _s_ - Split the hunk into smaller hunks. This only works if theres unchanged lines between the changes in the displayed hunk, so this wouldnt have any effect in the example above
- *e* - Manually edit the hunk. This is probably the most powerful option. As promised, it will open the hunk in a text editor and you can edit it to your hearts content - _e_ - Manually edit the hunk. This is probably the most powerful option. As promised, it will open the hunk in a text editor and you can edit it to your hearts content
## delete a file only from git repository ## delete a file only from git repository
@ -89,11 +89,8 @@ exit
### use git ssh over proxy socks ### use git ssh over proxy socks
```export GIT_SSH_COMMAND='ssh -o ProxyCommand="nc -X 5 -x 127.0.0.1:1080 %h %p"'``` `export GIT_SSH_COMMAND='ssh -o ProxyCommand="nc -X 5 -x 127.0.0.1:1080 %h %p"'`
### use git http over proxy socks ### use git http over proxy socks
```git config http.proxy 'socks5://127.0.0.1:1080``` `git config http.proxy 'socks5://127.0.0.1:1080`