C:\Program Files\Perforce\p4merge.exe -nl %bname -nr %yname %base %mine
C:\Program Files\Perforce\p4merge.exe -nb %bname -nl %tname -nr %yname -nm %mname %base %theirs %mine %merged
Vincent Rouillé Speedy37
Speedy37
/ userChrome.css
Last active
June 2, 2021 08:54
[Proton] button to tabs, sound icon, menu padding
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /** Add small space at the top */ | |
| .tab-stack { | |
| margin-top: 4px; | |
| } | |
| /** Make tabs looks like tabs not buttons */ | |
| /* attach tabs to the toolbar */ | |
| .tab-background { | |
| margin: 0px !important; | |
| border-bottom-left-radius: 0 !important; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/bash | |
| # Launches socat+npiperelay to relay the gpg-agent socket file for use in WSL | |
| # See https://justyn.io/blog/using-a-yubikey-for-gpg-in-windows-10-wsl-windows-subsystem-for-linux/ for details | |
| GPGDIR="${HOME}/.gnupg" | |
| USERNAME=Vincent | |
| # I use the same username for wsl and windows, but feel free to modify the paths below if that isn't the case | |
| WIN_GPGDIR="C:/Users/${USERNAME}/AppData/Roaming/gnupg" | |
| NPIPERELAY="${HOME}/npiperelay.exe" |
Speedy37
/ git-commit-diff.md
Created
July 10, 2020 08:52
List Different Commits Between Two Branches
This lists commits with the first line of their messages.
It also includes either a < or > arrow at the front of each commit indicating whether the commit is on:
<: left (feature)>: right (master)
git log --left-right --graph --cherry-pick --oneline feature...master
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| IP=$(ip -f inet -br addr show eth0 | awk '{match($0,/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/); ip = substr($0,RSTART,RLENGT> | |
| ARGS="interface portproxy add v4tov4 listenport=2222 listenaddress=192.168.1.0 connectport=2222 connectaddress=$IP" | |
| powershell.exe -Command "Start-Process netsh.exe -ArgumentList \"$ARGS\" -Verb RunAs" | |
| sudo /etc/init.d/ssh start |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then | |
| # we have colors :-) | |
| PS1="$(if [[ ${EUID} == 0 ]]; then echo '\[\033[01;31m\]\h'; else echo '\[\033[01;32m\]\u@\h'; fi)\[\033[01;34m\] \w \$([[ \$? != 0 ]] && echo \"\[\033[01;31m\]:(\[\033[01;34m\] \")\\$\[\033[00m\] " | |
| # Use this other PS1 string if you want \W for root and \w for all other users: | |
| # PS1="$(if [[ ${EUID} == 0 ]]; then echo '\[\033[01;31m\]\h\[\033[01;34m\] \W'; else echo '\[\033[01;32m\]\u@\h\[\033[01;34m\] \w'; fi) \$([[ \$? != 0 ]] && echo \"\[\033[01;31m\]:(\[\033[01;34m\] \")\\$\[\033[00m\] " | |
| alias ls="ls --color=auto" | |
| alias dir="dir --color=auto" |