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
Raffi Khatchadourian khatchad
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
| Node: synthetic < PythonLoader, Lcom/ibm/wala/FakeRootClass, fakeRootMethod()V > Context: Everywhere | |
| Node: synthetic < PythonLoader, Lcom/ibm/wala/FakeRootClass, fakeWorldClinit()V > Context: Everywhere | |
| Node: <Code body of function Lscript setup.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@2 ] | |
| Node: <Code body of function Lscript __init__.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@4 ] | |
| Node: <Code body of function Lscript exporters.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@6 ] | |
| Node: <Code body of function Lscript preproc_exporters.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@8 ] | |
| Node: <Code body of function Lscript preprocessors.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@10 ] | |
| Node: <Code body of function Lscript export.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@12 ] | |
| Node: <Code body of function Lscrip |
khatchad
/ callgraph nodes.txt
Last active
October 19, 2023 15:51
experimental_distribute_datasets_from_function call graph
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
| Node: synthetic < PythonLoader, Lcom/ibm/wala/FakeRootClass, fakeRootMethod()V > Context: Everywhere | |
| Node: synthetic < PythonLoader, Lcom/ibm/wala/FakeRootClass, fakeWorldClinit()V > Context: Everywhere | |
| Node: <Code body of function Lscript setup.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@2 ] | |
| Node: <Code body of function Lscript __init__.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@4 ] | |
| Node: <Code body of function Lscript exporters.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@6 ] | |
| Node: <Code body of function Lscript preproc_exporters.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@8 ] | |
| Node: <Code body of function Lscript preprocessors.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@10 ] | |
| Node: <Code body of function Lscript export.py> Context: CallStringContext: [ com.ibm.wala.FakeRootClass.fakeRootMethod()V@12 ] | |
| Node: <Code body of function Lscrip |
khatchad
/ github_desktop_ubuntu.sh
Last active
November 30, 2022 18:25
— forked from berkorbay/github_desktop_ubuntu.md
To install Github Desktop for Ubuntu
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 |
khatchad
/ 40-libinput.conf
Last active
November 29, 2022 15:39
Relatively working libinput configuration for the touchpad on Dell XPS 9320 running Ubuntu.
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" |
khatchad
/ pull.md
Last active
August 23, 2021 15:04
Pull vim config file changes from https://github.com/amix/vimrc.git to https://github.com/khatchad/vimrc.git
khatchad
/ persona.md
Created
March 6, 2021 18:08
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="" | |
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" |
khatchad
/ gist:93533192b4ea89eb67bd0ef8d217bb45
Created
February 4, 2020 21:04
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) |
khatchad
/ perf.patch
Last active
August 21, 2018 17:49
Conversion of JUnit tests to JMH tests for java-design-patterns
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; |
NewerOlder