MOD: updated the gitconfig to add submodule, also cleaned up the file
This commit is contained in:
parent
14b614e5a4
commit
9625d91ef5
72
.gitconfig
72
.gitconfig
|
@ -10,31 +10,6 @@
|
||||||
[web]
|
[web]
|
||||||
browser = google-chrome
|
browser = google-chrome
|
||||||
[alias]
|
[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 .
|
a = add .
|
||||||
ai = add -i
|
ai = add -i
|
||||||
#############
|
#############
|
||||||
|
@ -46,16 +21,6 @@
|
||||||
amr = am --resolved
|
amr = am --resolved
|
||||||
ams = am --skip
|
ams = am --skip
|
||||||
#############
|
#############
|
||||||
l = log --oneline
|
|
||||||
lg = log --oneline --graph --decorate
|
|
||||||
ls = log --stat
|
|
||||||
ll = log --oneline --decorate
|
|
||||||
#############
|
|
||||||
ch = checkout
|
|
||||||
co = checkout
|
|
||||||
chb = checkout -b
|
|
||||||
cob = checkout -b
|
|
||||||
#############
|
|
||||||
b = branch
|
b = branch
|
||||||
ba = branch -a
|
ba = branch -a
|
||||||
bd = branch -d
|
bd = branch -d
|
||||||
|
@ -70,6 +35,25 @@
|
||||||
buv = bundle verify
|
buv = bundle verify
|
||||||
bul = bundle list-heads
|
bul = bundle list-heads
|
||||||
#############
|
#############
|
||||||
|
c = commit
|
||||||
|
ca = commit -a
|
||||||
|
cm = commit . -m
|
||||||
|
cam = commit -am
|
||||||
|
cd = commit --amend
|
||||||
|
cad = commit -a --amend
|
||||||
|
#############
|
||||||
|
ch = checkout
|
||||||
|
co = checkout
|
||||||
|
chb = checkout -b
|
||||||
|
cob = checkout -b
|
||||||
|
#############
|
||||||
|
d = diff
|
||||||
|
dc = diff --cached
|
||||||
|
dl = difftool
|
||||||
|
dlc = difftool --cached
|
||||||
|
dk = diff --check
|
||||||
|
dck = diff --cached --check
|
||||||
|
#############
|
||||||
f = fetch
|
f = fetch
|
||||||
fo = fetch origin
|
fo = fetch origin
|
||||||
#############
|
#############
|
||||||
|
@ -77,6 +61,11 @@
|
||||||
#############
|
#############
|
||||||
fk = fsck
|
fk = fsck
|
||||||
#############
|
#############
|
||||||
|
l = log --oneline
|
||||||
|
lg = log --oneline --graph --decorate
|
||||||
|
ls = log --stat
|
||||||
|
ll = log --oneline --decorate
|
||||||
|
#############
|
||||||
m = merge
|
m = merge
|
||||||
ma = merge --abort
|
ma = merge --abort
|
||||||
mc = merge --continue
|
mc = merge --continue
|
||||||
|
@ -130,6 +119,19 @@
|
||||||
rso = remote show origin
|
rso = remote show origin
|
||||||
rpo = remote prune origin
|
rpo = remote prune origin
|
||||||
#############
|
#############
|
||||||
|
sub = submodule
|
||||||
|
#############
|
||||||
|
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
|
||||||
|
#############
|
||||||
w = show
|
w = show
|
||||||
wp = show -p
|
wp = show -p
|
||||||
wr = show -p --no-color
|
wr = show -p --no-color
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
"file": "/Users/j3g/.bash_android",
|
"file": "/Users/j3g/.bash_android",
|
||||||
"settings":
|
"settings":
|
||||||
{
|
{
|
||||||
"buffer_size": 1705,
|
"buffer_size": 1881,
|
||||||
"encoding": "UTF-8",
|
"encoding": "UTF-8",
|
||||||
"line_ending": "Unix"
|
"line_ending": "Unix"
|
||||||
}
|
}
|
||||||
|
@ -129,7 +129,7 @@
|
||||||
"file": "/Users/j3g/.bash_history",
|
"file": "/Users/j3g/.bash_history",
|
||||||
"settings":
|
"settings":
|
||||||
{
|
{
|
||||||
"buffer_size": 10223,
|
"buffer_size": 10212,
|
||||||
"line_ending": "Unix"
|
"line_ending": "Unix"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1215,7 +1215,7 @@
|
||||||
"semi_transient": false,
|
"semi_transient": false,
|
||||||
"settings":
|
"settings":
|
||||||
{
|
{
|
||||||
"buffer_size": 1705,
|
"buffer_size": 1881,
|
||||||
"regions":
|
"regions":
|
||||||
{
|
{
|
||||||
},
|
},
|
||||||
|
@ -2473,7 +2473,7 @@
|
||||||
"semi_transient": false,
|
"semi_transient": false,
|
||||||
"settings":
|
"settings":
|
||||||
{
|
{
|
||||||
"buffer_size": 10223,
|
"buffer_size": 10212,
|
||||||
"regions":
|
"regions":
|
||||||
{
|
{
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue