init import
This commit is contained in:
JohnE
commit
56c3080d8c
|
|
@ -0,0 +1,3 @@
|
|||
# ls aliases
|
||||
alias ll='ls -lFh'
|
||||
alias la='ls -lAh'
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
#openssl
|
||||
alias sha='openssl sha1'
|
||||
alias sha256='openssl dgst -sha256'
|
||||
alias sha512='openssl dgst -sha512'
|
||||
alias b64='openssl enc -base64 -e'
|
||||
alias b64dec='openssl enc -base64 -d'
|
||||
alias ciphers='openssl list-cipher-commands'
|
||||
|
||||
|
||||
### ### ### ### ###
|
||||
### AES Encrypt/Decrypt #
|
||||
|
||||
alias aes='openssl enc -aes-256-cbc'
|
||||
# encrypt file.txt to file.enc using 256-bit AES in CBC mode
|
||||
#openssl enc -aes-256-cbc -salt -in file.txt -out file.enc
|
||||
# the same, only the output is base64 encoded for, e.g., e-mail
|
||||
#openssl enc -aes-256-cbc -a -salt -in file.txt -out file.enc
|
||||
# decrypt binary file.enc
|
||||
#openssl enc -d -aes-256-cbc -in file.enc
|
||||
# decrypt base64-encoded version
|
||||
#openssl enc -d -aes-256-cbc -a -in file.enc
|
||||
# provide password on command line
|
||||
#openssl enc -aes-256-cbc -salt -in file.txt -out file.enc -pass pass:mySillyPassword
|
||||
# provide password in a file
|
||||
#openssl enc -aes-256-cbc -salt -in file.txt -out file.enc -pass file:/path/to/secret/password.txt
|
||||
|
|
@ -0,0 +1,500 @@
|
|||
rm monocle.git
|
||||
git s
|
||||
git ba
|
||||
git r
|
||||
git pull origin android
|
||||
git l
|
||||
git sd
|
||||
git s
|
||||
git ba
|
||||
git ch android
|
||||
q
|
||||
pwd
|
||||
cd ..
|
||||
ll
|
||||
rm -rf monocle_bak/
|
||||
mv monocle monocle_bak
|
||||
git clone /Users/j3g/dev/monocle/monocle.git
|
||||
ll
|
||||
mv monocle.git monocle
|
||||
ll
|
||||
cd monocle
|
||||
git ba
|
||||
git s
|
||||
git ch android
|
||||
git l
|
||||
ll
|
||||
cd ..
|
||||
ll
|
||||
rm -rf monocle
|
||||
git clone /Users/j3g/dev/monocle/monocle.git
|
||||
ll
|
||||
mv monocle.git/ monocle
|
||||
ll
|
||||
cd monocle
|
||||
l
|
||||
ll
|
||||
cd clients/android/
|
||||
ll
|
||||
cd 3rdPartyLibs/
|
||||
ll
|
||||
cd OrmliteAndroidSqlcipher/
|
||||
ll
|
||||
ll
|
||||
cd libary/
|
||||
ll
|
||||
la
|
||||
la
|
||||
git add -f .classpath .project
|
||||
git s
|
||||
pwd
|
||||
cd /Users/j3g/dev/monocle/
|
||||
ll
|
||||
cd source/monocle
|
||||
ll
|
||||
git s
|
||||
pwd
|
||||
pwd
|
||||
git s
|
||||
pwd
|
||||
git s
|
||||
git add .
|
||||
git s
|
||||
git cam 'WIP timestamp'
|
||||
git buc monocle.git --all
|
||||
git ba
|
||||
cp monocle.git /Volumes/J3G_STUFF/
|
||||
ll
|
||||
rm monocle.git
|
||||
git l
|
||||
q
|
||||
cp /Volumes/J3G_STUFF/monocle.git /Users/j3g/dev/monocle/
|
||||
git r
|
||||
git pull origin
|
||||
git l
|
||||
cd ..
|
||||
ll
|
||||
rm -rf monocle_bak
|
||||
mv monocle monocle_bak
|
||||
git clone /Users/j3g/dev/monocle/monocle.git
|
||||
ll
|
||||
mv monocle.git monocle
|
||||
ll
|
||||
git s
|
||||
ll
|
||||
cd monocle
|
||||
git s
|
||||
git cam 'Android: timestamp added to messaging screen'
|
||||
git buc monocle.git --all
|
||||
ll
|
||||
cp monocle.git /Volumes/J3G_STUFF/
|
||||
rm monocle.git
|
||||
pwd
|
||||
cddev
|
||||
ll
|
||||
cd bittorrent_research/
|
||||
ll
|
||||
cd torrent4j
|
||||
ll
|
||||
git s
|
||||
git checkout -- .travis.xml
|
||||
git checkout -- .travis.yml
|
||||
git checkout -- src/site/xdoc/index.xml
|
||||
git s
|
||||
pwd
|
||||
git s
|
||||
git ba
|
||||
git fetch
|
||||
git ba
|
||||
git s
|
||||
git cam 'netty 5.x conversion'
|
||||
git s
|
||||
ls xdoc/
|
||||
git ba
|
||||
git chb netty40
|
||||
pwd
|
||||
git s
|
||||
bit ba
|
||||
git ba
|
||||
ll
|
||||
pwd
|
||||
ll
|
||||
la
|
||||
git pull
|
||||
git fetch
|
||||
git ba
|
||||
git ls
|
||||
git ba
|
||||
git ch master
|
||||
git bdd netty40
|
||||
git bd netty40
|
||||
git ba
|
||||
git ch netty40
|
||||
git ba
|
||||
git s
|
||||
find . | grep .DS_Store
|
||||
find . | grep .DS_Store | xargs rm
|
||||
find . | grep .DS_Store
|
||||
git s
|
||||
ll
|
||||
cd src/main/java/
|
||||
ll
|
||||
pwd
|
||||
pwd
|
||||
cd ../../..
|
||||
ll
|
||||
cp ~/Downloads/ubuntu-14.04-server-amd64.iso.torrent .
|
||||
ll
|
||||
mv ubuntu-14.04-server-amd64.iso.torrent u.torrent
|
||||
ll
|
||||
pwd
|
||||
diskutil list
|
||||
ls /Volumes/
|
||||
lsof
|
||||
lsof | less
|
||||
ls /Volumes/
|
||||
sudo umount -f /Volumes/misc
|
||||
sudo umount -f /Volumes/misc
|
||||
su overlord
|
||||
ssh ssh@10.5.1.50
|
||||
ssh ssh@10.5.1.50
|
||||
ssh ssh@10.5.1.50
|
||||
ssh ssh@10.5.1.50
|
||||
ping 10.5.1.2
|
||||
ifconfig
|
||||
ssh 10.5.1.50
|
||||
ping 10.5.1.50
|
||||
ping 10.5.1.1
|
||||
ping 10.5.1.1
|
||||
ping 10.5.1.1
|
||||
ifconfig
|
||||
ping 10.5.1.1
|
||||
ping 10.5.1.50
|
||||
ping 10.5.1.50
|
||||
ping 10.5.1.1
|
||||
ping 10.5.1.1
|
||||
ifconfig
|
||||
ping 10.5.1.1
|
||||
ssh git.malloc.io
|
||||
ping git.malloc.io
|
||||
ping duh.malloc.io
|
||||
/Applications/Android\ Studio.app/Contents/MacOS/studio ; exit;
|
||||
echo $JAVA_HOME
|
||||
+
|
||||
ssh 10.5.1.50
|
||||
ifconfig
|
||||
ssh git.malloc.io
|
||||
whoami
|
||||
ping git.malloc.io
|
||||
ssh dev2.malloc.io
|
||||
clear
|
||||
pwd
|
||||
ls
|
||||
ls /Volumes/
|
||||
cd /Volumes/SSD_Stuff/
|
||||
l;s
|
||||
ls
|
||||
ll
|
||||
cd Videos/
|
||||
ll
|
||||
python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 3 -e .mkv -t
|
||||
python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 3 -e .mkv
|
||||
python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv -t
|
||||
python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv
|
||||
ls
|
||||
mkdir stupid
|
||||
cd stupid
|
||||
python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv -t
|
||||
python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv -t
|
||||
python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv
|
||||
cd ..
|
||||
HandBrakeCLI -v -i /Volumes/videos/Movies_Other/Friday\ \(1995\)/Friday\ \(1995\).mkv -o Friday.1995.mp4 -Z "Android Tablet"
|
||||
HandBrakeCLI -v -i /Volumes/videos/TV_Other/The\ League/Season\ 4/The\ League\ -\ S04E12\ -\ 720p\ BluRay\ X264-REWARD.mkv -o The.League.S04E12.720p.mp4 -Z "Android Tablet"
|
||||
ssh 10.5.1.50
|
||||
pwd
|
||||
python dev/python_sandbox/handbrake2.py
|
||||
scp ~/dev/python_sandbox/handbrake.py 10.5.1.50:/zetabits/video/MobileDevices/TheLeague
|
||||
scp ~/dev/python_sandbox/handbrake.py 10.5.1.50:/zetabits/videos/MobileDevices/TheLeague
|
||||
ssh 10.5.1.50
|
||||
scp ~/dev/python_sandbox/handbrake2.py 10.5.1.50:/zetabits/videos/MobileDevices/TheLeague
|
||||
scp ~/dev/python_sandbox/handbrake2.py 10.5.1.50:/zetabits/videos/MobileDevices/TheLeague
|
||||
ls
|
||||
ssh 10.5.1.50
|
||||
ssh 10.5.1.50
|
||||
ssh 10.5.1.50
|
||||
ssh 10.5.1.50
|
||||
ssh 10.5.1.50
|
||||
ll
|
||||
ls scripts/
|
||||
ls dev/python_sandbox/
|
||||
ls /Volumes/
|
||||
cd /Volumes/SSD_Stuff/
|
||||
ls
|
||||
mkdir chima
|
||||
cd chima/
|
||||
python ~/dev/python_sandbox/handbrake.py
|
||||
python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Kids/Legends.of.Chima/ -e .mkv -t
|
||||
python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Kids/Legends.of.Chima/ -e .mkv
|
||||
ssh 10.5.1.50
|
||||
cd
|
||||
ls
|
||||
su overlord
|
||||
ll /usr/local/bin
|
||||
ls /usr/local/
|
||||
ls /usr/local/Cellar/
|
||||
ls /usr/local/Cellar/gradle/
|
||||
ls /usr/local/Cellar/gradle/1.12/
|
||||
gradle -v
|
||||
ls
|
||||
cd dev
|
||||
cd python_sandbox/
|
||||
ls
|
||||
scp handbrake2.py 10.5.1.50:dev/scripts
|
||||
scp handbrake.py 10.5.1.50:dev/scripts
|
||||
scp handbrake.py 10.5.1.50:dev/scripts
|
||||
ssh 10.5.1.50
|
||||
which java
|
||||
jova
|
||||
java -version
|
||||
java
|
||||
pwd
|
||||
ls
|
||||
ls 3rdPartyLibs/
|
||||
pwd
|
||||
ll
|
||||
la
|
||||
ll
|
||||
git init
|
||||
git add .
|
||||
git s
|
||||
git cm 'init import'
|
||||
git s
|
||||
git l
|
||||
git ls
|
||||
git remote add origin git@git.malloc.io:j3g/pythonsandbox.git
|
||||
git push -u origin master
|
||||
git b
|
||||
git ba
|
||||
cd ../aa
|
||||
ls
|
||||
cd telegram/
|
||||
ls
|
||||
ls
|
||||
python parse.py
|
||||
python parse.py -f var/cache4-4-15-2014.db -o newdata.csv
|
||||
ll
|
||||
ssh 10.5.1.50
|
||||
ssh 10.5.1.50
|
||||
cd /Applications/MultiFirefox.app
|
||||
cd /Applications/MultiFirefox.app
|
||||
cd /Applications/Utilities/Terminal.app
|
||||
adb devices
|
||||
ls
|
||||
cd
|
||||
ll
|
||||
ls scripts/
|
||||
cat scripts/launch_android.sh
|
||||
ll
|
||||
cat androidenv.sh
|
||||
la /Applications/
|
||||
ll
|
||||
cat androidenv.sh
|
||||
ls /Applications/android-dev/
|
||||
./androidenv.sh
|
||||
adb devices
|
||||
source androidenv.sh
|
||||
adb
|
||||
adb devices
|
||||
adb devices
|
||||
adb devices
|
||||
adb devices
|
||||
su overlord
|
||||
eixt
|
||||
exit
|
||||
cd
|
||||
pwd
|
||||
cd /
|
||||
ll
|
||||
find -name "bitcasa"
|
||||
man find
|
||||
find -iname "bitcasa"
|
||||
find . -iname "bitcasa"
|
||||
cd
|
||||
cd Music/Music\ Converter/
|
||||
ll
|
||||
cp /Volumes/videos/nzb/completed/Iggy_Azalea-The_New_Classic-Limited_Deluxe_Edition-CD-FLAC-2014-PERFECT/* .
|
||||
ll
|
||||
ffmpeg -i 001-iggy_azalea-walk_the_line.flac -f mp3 -ab 256000 001-iggy_azalea-walk_the_line.mp3
|
||||
ll
|
||||
(for FILE in *.flac ; do ffmpeg -i "$FILE" -f mp3 -ab 256000 "`basename "$FILE" .flac`.mp3" || break; done)
|
||||
(for FILE in *.flac ; do ffmpeg -i "$FILE" -f mp3 -ab 256000 "`basename "$FILE" .flac`.mp3" || break; done)
|
||||
(for FILE in *.flac ; do ffmpeg -i "$FILE" -f mp3 -ab 256000 "`basename "$FILE" .flac`.mp3" || break; done)
|
||||
ll
|
||||
ll *.mp3
|
||||
mv *.flac /Volumes/SSD_Stuff/music/Iggy_Azalea/The_New_Classic/
|
||||
ll
|
||||
which java
|
||||
ll /usr/bin/java
|
||||
java --version
|
||||
java -version
|
||||
which java
|
||||
ll /System/Library/Frameworks/JavaVM.framework/Versions
|
||||
ls /System/Library/Java/
|
||||
ls /System/Library/Java/Support/
|
||||
ls /System/Library/Java/Support/CoreDeploy.bundle/
|
||||
ls /System/Library/Java/Support/CoreDeploy.bundle/Contents/
|
||||
ls /System/Library/Java/Support/CoreDeploy.bundle/Contents/Java/
|
||||
cd
|
||||
ll
|
||||
cat androidenv.sh
|
||||
ls /Applications/android-dev/
|
||||
ll /Applications/android-dev/
|
||||
/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java
|
||||
/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java -version
|
||||
ll /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java -version
|
||||
alias
|
||||
unalias java
|
||||
alias
|
||||
java -version
|
||||
which java
|
||||
which gradle
|
||||
ll /Applications/android-dev/
|
||||
set
|
||||
set | grep JAVA
|
||||
which java
|
||||
set JAVA_HOME=/Applications/android-dev/jdk1.7.0_17/Contents/Home
|
||||
ls ~
|
||||
la ~
|
||||
ls ~/AndroidStudioProjects/
|
||||
ll ~/AndroidStudioProjects/
|
||||
ll ~/.android/
|
||||
adb'
|
||||
|
||||
|
||||
adb
|
||||
ls
|
||||
source androidenv.sh
|
||||
and
|
||||
adb
|
||||
adb devices
|
||||
pwd
|
||||
ll
|
||||
gradle --version
|
||||
svn
|
||||
cd dev
|
||||
ls
|
||||
cd picseal/
|
||||
ls
|
||||
cd research/
|
||||
ls
|
||||
cd source/
|
||||
ls
|
||||
uname -a
|
||||
ssh 10.5.1.50
|
||||
ssh 10.5.1.50
|
||||
pmset displaysleepnow
|
||||
alias
|
||||
ls
|
||||
cd dev
|
||||
ls ../scripts/
|
||||
ls scir
|
||||
ls cri
|
||||
ls scripts/
|
||||
ls
|
||||
ll
|
||||
adb
|
||||
less androidenv.sh
|
||||
cat androidenv.sh
|
||||
less androidenv.sh
|
||||
pwd
|
||||
cd dev
|
||||
ll
|
||||
cd websockets/
|
||||
ll
|
||||
ls UIWebSockets/
|
||||
ll UIWebSockets/
|
||||
ll
|
||||
ll UIWebSockets/
|
||||
git r
|
||||
pwd
|
||||
ll
|
||||
mkdir source
|
||||
mv UIWebSockets source/
|
||||
mv example_src source/
|
||||
ll
|
||||
cd source
|
||||
ll
|
||||
cd UIWebSockets/
|
||||
ll
|
||||
git s
|
||||
git b
|
||||
git r
|
||||
git ra
|
||||
git ra malloc git@git.malloc.io:j3g/uiwebsocket.git
|
||||
git r
|
||||
git s
|
||||
git l
|
||||
git add client/css/styles_OLD.css
|
||||
git s
|
||||
git l
|
||||
git r
|
||||
git
|
||||
git b
|
||||
git cam 'new cosmetic changes'
|
||||
git s
|
||||
git push bb
|
||||
git r
|
||||
git l
|
||||
git fetch malloc
|
||||
git b
|
||||
git ba
|
||||
git b merging
|
||||
git b
|
||||
git r
|
||||
git ch malloc/working
|
||||
git chb malloc/working
|
||||
git b
|
||||
git ba
|
||||
git l
|
||||
git ch merging
|
||||
git ba
|
||||
git ch malloc/working
|
||||
git ba
|
||||
git chb mg
|
||||
git ba
|
||||
git merge master
|
||||
git s
|
||||
git l
|
||||
git r
|
||||
git ba
|
||||
git ch working
|
||||
git merge mg
|
||||
git ba
|
||||
git push malloc
|
||||
ll
|
||||
cd pserver/
|
||||
ls
|
||||
pyton server.py
|
||||
python server.py
|
||||
pwd
|
||||
cd /User/j3g/dev/
|
||||
ll
|
||||
cd /Users/j3g/dev/
|
||||
ll
|
||||
mkdir undertowswirl
|
||||
cd undertowswirl/
|
||||
ls
|
||||
mkdir source
|
||||
cd source/
|
||||
mkdir uts
|
||||
ll
|
||||
git clone git@git.malloc.io:j3g/uts.git
|
||||
ll
|
||||
cd uts
|
||||
ll
|
||||
pwd
|
||||
ll
|
||||
mkdir gui
|
||||
ls
|
||||
cd gui
|
||||
ll
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
# Mac Shortcuts
|
||||
alias eject='drutil tray eject'
|
||||
|
||||
#dev
|
||||
alias cddev='cd /Volumes/MAVERICKS/Users/j3g/dev'
|
||||
|
||||
# alias subl='open -a "Sublime Text 2"'
|
||||
alias subl='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
|
||||
alias subl3='/Applications/Sublime\ Text\ 3.app/Contents/SharedSupport/bin/subl'
|
||||
|
||||
# java (easy to remember for commandline)
|
||||
#alias java='/Applications/android-dev/jre1.7.0_45/Contents/Home/bin/java'
|
||||
|
||||
# android
|
||||
#alias adb='/Volumes/DataStore/apps/adt-bundle-mac-x86_64/android-sdk-macosx/platform-tools/adb'
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
# aliases
|
||||
source ~/.bash_aliases
|
||||
source ~/.bash_mac
|
||||
source ~/.bash_crypto
|
||||
source ~/.bash_servers
|
||||
|
||||
# prompt
|
||||
PS1="[\u@\h:\W] "
|
||||
|
||||
# terminal colors
|
||||
export CLICOLOR=1
|
||||
# export LSCOLORS=Bxfxcxdxbxegedabagacad
|
||||
|
||||
export jdkhome='/Applications/android-dev/jdk1.7.0_17/Contents/Home'
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
# ssh servers
|
||||
alias malloc='ssh j3g@dev.malloc.io -D 7891'
|
||||
|
|
@ -0,0 +1,170 @@
|
|||
[user]
|
||||
name = JohnE
|
||||
email = j@us3.co
|
||||
[push]
|
||||
default = simple
|
||||
[core]
|
||||
editor = vim
|
||||
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
|
||||
excludesfile = /Users/johne/.gitignore_global
|
||||
[web]
|
||||
browser = google-chrome
|
||||
[alias]
|
||||
s = status
|
||||
sb = status -s -b
|
||||
#############
|
||||
sa = stash apply
|
||||
sc = stash clear
|
||||
sd = stash drop
|
||||
sl = stash list
|
||||
sp = stash pop
|
||||
ss = stash save
|
||||
sw = stash show
|
||||
#############
|
||||
d = diff
|
||||
dc = diff --cached
|
||||
dl = difftool
|
||||
dlc = difftool --cached
|
||||
dk = diff --check
|
||||
dck = diff --cached --check
|
||||
#############
|
||||
c = commit
|
||||
ca = commit -a
|
||||
cm = commit . -m
|
||||
cam = commit -am
|
||||
cd = commit --amend
|
||||
cad = commit -a --amend
|
||||
#############
|
||||
a = add .
|
||||
ai = add -i
|
||||
#############
|
||||
ap = apply
|
||||
as = apply --stat
|
||||
ac = apply --check
|
||||
#############
|
||||
ama = am --abort
|
||||
amr = am --resolved
|
||||
ams = am --skip
|
||||
#############
|
||||
l = log --oneline
|
||||
lg = log --oneline --graph --decorate
|
||||
ls = log --stat
|
||||
ll = log --oneline --decorate
|
||||
#############
|
||||
ch = checkout
|
||||
chb = checkout -b
|
||||
#############
|
||||
b = branch
|
||||
ba = branch -a
|
||||
bd = branch -d
|
||||
br = branch -r
|
||||
brd = branch -rd
|
||||
bl = branch -lvv
|
||||
bv = branch -lvv
|
||||
#############
|
||||
bu = bundle
|
||||
buc = bundle create
|
||||
buv = bundle verify
|
||||
bul = bundle list-heads
|
||||
#############
|
||||
f = fetch
|
||||
fo = fetch origin
|
||||
#############
|
||||
fp = format-patch
|
||||
#############
|
||||
fk = fsck
|
||||
#############
|
||||
m = merge
|
||||
ma = merge --abort
|
||||
mc = merge --continue
|
||||
ms = merge --skip
|
||||
#############
|
||||
mt = mergetool
|
||||
#############
|
||||
pr = prune -v
|
||||
#############
|
||||
ps = push
|
||||
psf = push -f
|
||||
psu = push -u
|
||||
pso = push origin
|
||||
psom = push origin master
|
||||
#############
|
||||
pl = pull
|
||||
plu = pull -u
|
||||
plo = pull origin
|
||||
plp = pull upstream
|
||||
plom = pull origin master
|
||||
plpm = pull upstream master
|
||||
#############
|
||||
pb = pull --rebase
|
||||
pbo = pull --rebase origin
|
||||
pbp = pull --rebase upstream
|
||||
pbom = pull --rebase origin master
|
||||
pbpm = pull --rebase upstream master
|
||||
#############
|
||||
rb = rebase
|
||||
rba = rebase --abort
|
||||
rbc = rebase --continue
|
||||
rbi = rebase --interactive
|
||||
rbs = rebase --skip
|
||||
#############
|
||||
re = reset
|
||||
rh = reset HEAD
|
||||
reh = reset --hard
|
||||
rem = reset --mixed
|
||||
res = reset --soft
|
||||
rehh = reset --hard HEAD
|
||||
remh = reset --mixed HEAD
|
||||
resh = reset --soft HEAD
|
||||
#############
|
||||
r = remote -v
|
||||
ra = remote add
|
||||
rr = remote rm
|
||||
rd = remote rm
|
||||
rv = remote -v
|
||||
rp = remote prune
|
||||
rs = remote show
|
||||
rso = remote show origin
|
||||
rpo = remote prune origin
|
||||
#############
|
||||
w = show
|
||||
wp = show -p
|
||||
wr = show -p --no-color
|
||||
#############
|
||||
human = name-rev --name-only --refs=refs/heads/*
|
||||
[color]
|
||||
ui = always
|
||||
[color "branch"]
|
||||
current = yellow bold
|
||||
local = green bold
|
||||
remote = cyan bold
|
||||
[color "diff"]
|
||||
meta = yellow bold
|
||||
frag = magenta bold
|
||||
old = red bold
|
||||
new = green bold
|
||||
whitespace = red reverse
|
||||
[color "status"]
|
||||
added = green bold
|
||||
changed = yellow bold
|
||||
untracked = red bold
|
||||
[diff]
|
||||
tool = diffmerge
|
||||
[difftool]
|
||||
prompt = false
|
||||
[difftool "diffmerge"]
|
||||
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
|
||||
[merge]
|
||||
tool = diffmerge
|
||||
[mergetool]
|
||||
keepBackup = false
|
||||
prompt = false
|
||||
[mergetool "diffmerge"]
|
||||
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
|
||||
trustExitCode = true
|
||||
[difftool "sourcetree"]
|
||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
||||
path =
|
||||
[mergetool "sourcetree"]
|
||||
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
||||
trustExitCode = true
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
*~
|
||||
.DS_Store
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
syntax: glob
|
||||
|
||||
*~
|
||||
.DS_Store
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
#
|
||||
# set the path to android executables
|
||||
#
|
||||
|
||||
# java
|
||||
export JAVA_HOME=/Applications/android-dev/jdk1.7.0_17/Contents/Home
|
||||
export JAVA_BIN=/Applications/android-dev/jdk1.7.0_17/Contents/Home/bin
|
||||
|
||||
# ant
|
||||
export ANT_HOME=/Applications/android-dev/ant
|
||||
export ANT_BIN=/Applications/android-dev/ant/bin
|
||||
|
||||
# set path
|
||||
export PATH=$ANT_BIN:$JAVA_BIN:$PATH
|
||||
|
||||
### ANDROID ###
|
||||
|
||||
# used by ant scripts
|
||||
export ANDROID_SDK_HOME=/Applications/android-dev/android-sdk-macosx
|
||||
|
||||
# set path to android tools (adb, zipalign, dx, etc...)
|
||||
export PATH=/Applications/android-dev/android-sdk-macosx/build-tools/17.0.0:$PATH
|
||||
export PATH=/Applications/android-dev/android-sdk-macosx/platform-tools:$PATH
|
||||
export PATH=/Applications/android-dev/android-sdk-macosx/tools:$PATH
|
||||
|
||||
# ndk
|
||||
export PATH=/Applications/android-dev/android-ndk-r9b:$PATH
|
||||
Loading…
Reference in New Issue