git pull upstream master # upstream set to https://github.com/amix/vimrc
git mergetool --gui path # to resolve conflicts
git co --thiers path # to take theirs
git add path # to take theirs
git rm -r path # for files they removed
View github_desktop_ubuntu.sh
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
## Follow this link for further updates to Github Desktop for Ubuntu https://github.com/shiftkey/desktop/releases/latest | |
# UPDATE (2022-11-07): Thanks to Sxvxgee's message, the updated code is as follows | |
wget https://github.com/shiftkey/desktop/releases/download/release-3.1.1-linux1/GitHubDesktop-linux-3.1.1-linux1.deb | |
### Uncomment below line if you have not installed gdebi-core before | |
# sudo apt-get install gdebi-core | |
sudo gdebi GitHubDesktop-linux-3.1.1-linux1.deb |
View 40-libinput.conf
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
# Match on all types of devices but joysticks | |
# | |
# If you want to configure your devices, do not copy this file. | |
# Instead, use a config snippet that contains something like this: | |
# | |
# Section "InputClass" | |
# Identifier "something or other" | |
# MatchDriver "libinput" | |
# | |
# MatchIsTouchpad "on" |
View pull.md
View persona.md
Jack, a primary school teacher
Jack, age 32, is a primary school teaching ...
Scenarios
Fishing in Ullapool
Jack is a primary school teacher in Ullapool, teaching P6 pupils. He has decided that a class project ...
View mysql_backup.sh
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 | |
USER="" | |
PASSWORD="" | |
OUTPUT="$HOME/backup" | |
DATABASES=("skeletal_implementers" "phpmyadmin" "skeletal_implementers_abstract_only") | |
MYSQL_DUMP="/opt/bitnami/mysql/bin/mysqldump" | |
REMOTE_DIR="ftp://websupport1.citytech.cuny.edu/backup/" | |
REMOTE_USER="" | |
REMOTE_PWD="" | |
View doc2md.sh
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 | |
INPUT=$1 | |
OUTPUT=$2 | |
/usr/bin/pandoc "$INPUT" -t gfm --wrap=none | /usr/bin/uni2ascii -B > "$OUTPUT" |
View gist:93533192b4ea89eb67bd0ef8d217bb45
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
OpenGL vendor string: X.Org | |
OpenGL renderer string: AMD Radeon (TM) Pro WX Series (POLARIS11, DRM 3.33.0, 5.3.0-29-generic, LLVM 9.0.0) | |
OpenGL core profile version string: 4.5 (Core Profile) Mesa 19.2.8 | |
OpenGL core profile shading language version string: 4.50 | |
OpenGL core profile context flags: (none) | |
OpenGL core profile profile mask: core profile | |
OpenGL core profile extensions: | |
OpenGL version string: 4.5 (Compatibility Profile) Mesa 19.2.8 | |
OpenGL shading language version string: 4.50 | |
OpenGL context flags: (none) |
View perf.patch
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
diff --git a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java b/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java | |
index b6467e232..aef824817 100644 | |
--- a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java | |
+++ b/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java | |
@@ -23,11 +23,18 @@ | |
package com.iluwatar.abstractdocument; | |
import org.junit.Test; | |
+import org.openjdk.jmh.annotations.Benchmark; | |
+import org.openjdk.jmh.annotations.Level; |
View integers.cpp
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
#include <iostream> | |
#include <climits> | |
using namespace std; | |
int main() { | |
int i; | |
int j; | |
int result; | |
cout << "Enter i: "; |
View integers.cpp
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
#include <iostream> | |
#include <climits> | |
using namespace std; | |
int main() { | |
int i; | |
int j; | |
int result; | |
cout << "Enter i: "; |
NewerOlder