graph TD;
A-->B;
A-->C;
B-->D;
C-->D;
---
graph TD;
A-->B;
A-->C;
B-->D;
C-->D;
---
#!/usr/bin/env python3 | |
# | |
# git-subline-merge | |
# | |
# Created by Paul Altin on 02.03.18. | |
# Downloaded from https://github.com/paulaltin/git-subline-merge | |
# | |
# An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines. |
import $ivy.`com.squareup.okhttp:mockwebserver:2.5.0` | |
import com.squareup.okhttp.mockwebserver._ | |
val ws = new MockWebServer | |
ws.start() | |
val url = ws.url("/test") | |
println(url) | |
val response = new MockResponse | |
response.setBody( """ { "key" : "value" } """) |
curl \ | |
--header "PRIVATE-TOKEN: $GITLAB_PAT" \ | |
"https://gitlab.com/api/v4/groups/$GROUP_ID/merge_requests?state=opened&scope=all&author_id=$AUTHOR_ID" \ | |
| jq -r '.[] | "\(.project_id) \(.iid)"' \ | |
| while read -r projectid mrid; do | |
curl -X PUT --header "PRIVATE-TOKEN: $GITLAB_PAT" "https://gitlab.com/api/v4/projects/$projectid/merge_requests/$mrid/rebase" | |
done |
// see https://stackoverflow.com/questions/51025018/referenceerror-admindirectory-is-not-defined to activate AdminDirectory | |
// - resources > advanced google services > Admin Directory API > Activate | |
// - https://console.cloud.google.com/apis/api/admin.googleapis.com/overview?project=project-id-123456&authuser=1 | |
function onOpen(e) { | |
FormApp.getUi() | |
.createAddonMenu() | |
.addItem('Update users', 'setUsers') | |
.addToUi(); | |
} |
We use git-secret to encrypt/decrypt sensitive information like production passwords.
Each developper needs to generate a pair of private/public key.
https://help.github.com/articles/generating-a-new-gpg-key/
gpg --full-generate-key
set xdata time | |
set timefmt "%Y-%m-%d" | |
set datafile separator "," | |
set format x "%Y-%m-%d" | |
set terminal png size 768,768 enhanced truecolor font 'Roboto,9' | |
set xlabel "Date" | |
set xlabel "LoC" | |
set pointsize 0.8 | |
set border 11 | |
set xtics out |
import java.util.regex.Matcher; | |
import java.util.regex.Pattern; | |
public class DemoFreeSpacingRegex { | |
public static void main(String[] args) { | |
String re = "(?x)\n" | |
+ "# ?x is free-spacing flag to allow #comments, must be right at start of String\n" | |
+ "(19|20\\d\\d) # year (group 1)\n" | |
+ "[- /.] # separator\n" |
val re = """(?x) | |
# Match a 20th or 21st century date in yyyy-mm-dd format | |
# ?x is free-spacing flag to allow #comments, must be right at start of String | |
(19|20)\d\d # year (group 1) | |
[- /.] # separator | |
(0[1-9]|1[012]) # month (group 2) |
#i3 window manager | |
sudo -E pacman -S --needed rofi i3-wm i3lock i3blocks i3status-manjaro i3-theme-dark lxappearance-gtk3 | |
#need to run lxapparence afterwards to restore icons |