diff --git a/Divers/replique citation/citation.md b/Divers/replique citation/citation.md index 75a3ab1..8825ea7 100644 --- a/Divers/replique citation/citation.md +++ b/Divers/replique citation/citation.md @@ -2,11 +2,10 @@ > 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 - diff --git a/IT/git/Git.md b/IT/git/Git.md index 3fcd53b..38c511e 100644 --- a/IT/git/Git.md +++ b/IT/git/Git.md @@ -4,7 +4,7 @@ ## 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 @@ -12,11 +12,11 @@ add *--recurse-submodules* to clone command this will ask if you want to add each modification with this option: -- *y* - Yes, add this hunk -- *n* - No, don’t add this hunk -- *d* - No, don’t add this hunk and all other remaining hunks. Useful if you’ve already added what you want to, and want to skip over the rest -- *s* - Split the hunk into smaller hunks. This only works if there’s unchanged lines between the changes in the displayed hunk, so this wouldn’t 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 +- _y_ - Yes, add this hunk +- _n_ - No, don’t add this hunk +- _d_ - No, don’t add this hunk and all other remaining hunks. Useful if you’ve already added what you want to, and want to skip over the rest +- _s_ - Split the hunk into smaller hunks. This only works if there’s unchanged lines between the changes in the displayed hunk, so this wouldn’t 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 ## delete a file only from git repository @@ -28,7 +28,7 @@ be carefull can't push repo last time use need to be in a repo with no modification ```bash -git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch $file" HEAD +git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch $file" HEAD rm -rf .git/refs/original/ && git reflog expire --all && git gc --aggressive --prune ``` @@ -89,11 +89,8 @@ exit ### 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 -```git config http.proxy 'socks5://127.0.0.1:1080``` - - - +`git config http.proxy 'socks5://127.0.0.1:1080`