Added db and bumped emacs pointer.
This commit is contained in:
parent
f770ae6c7b
commit
77ad61d281
@ -1 +1 @@
|
|||||||
Subproject commit 11ab9113442bb886a30a7c79dead43b37f8c49c5
|
Subproject commit 30e294b77b1d8d8b9367cc74c1ba307752641494
|
@ -2,53 +2,55 @@
|
|||||||
l = log --pretty=oneline -n 20 --graph
|
l = log --pretty=oneline -n 20 --graph
|
||||||
s = status -s
|
s = status -s
|
||||||
c = clone --recursive
|
c = clone --recursive
|
||||||
ff = merge --ff-only
|
ff = merge --ff-only
|
||||||
ca = !git add -A && git commit -av
|
ca = !git add -A && git commit -av
|
||||||
tb = rev-parse --abbrev-ref --symbolic-full-name @{u}
|
tb = rev-parse --abbrev-ref --symbolic-full-name @{u}
|
||||||
cam = commit -am
|
cam = commit -am
|
||||||
poh = push origin HEAD
|
poh = push origin HEAD
|
||||||
pohm = push origin HEAD:master
|
pohm = push origin HEAD:master
|
||||||
suir = submodule update --init --recursive
|
suir = submodule update --init --recursive
|
||||||
amend = commit -a --amend -C HEAD
|
amend = commit -a --amend -C HEAD
|
||||||
modified = diff HEAD --name-only
|
modified = diff HEAD --name-only
|
||||||
untracked = "!u() { git status -s | grep "??" | awk '{print $2}'; }; u"
|
untracked = "!u() { git status -s | grep "??" | awk '{print $2}'; }; u"
|
||||||
dirty = "!t() { test -n \"$(git status --porcelain)\"; }; t"
|
dirty = "!t() { test -n \"$(git status --porcelain)\"; }; t"
|
||||||
# diff tracking branch merge base
|
# diff tracking branch merge base
|
||||||
dtbmb = !git diff `git tb`...HEAD
|
dtbmb = !git diff `git tb`...HEAD
|
||||||
root = rev-parse --show-toplevel
|
root = rev-parse --show-toplevel
|
||||||
ignore = !"i() { printf \"\n$1\" >> "`git root`/.gitignore"; }; i"
|
ignore = "!i() { printf \"\n$1\" >> "`git root`/.gitignore"; }; i"
|
||||||
|
power-clean = clean -ffd
|
||||||
|
db = !"db() { git diff HEAD~"$1"; }; db"
|
||||||
|
|
||||||
branches = branch -a
|
branches = branch -a
|
||||||
remotes = remote -v
|
remotes = remote -v
|
||||||
|
|
||||||
which-branch = "!wb() { b="$(git symbolic-ref HEAD)" && echo ${b#refs/heads/}; }; wb"
|
which-branch = "!wb() { b="$(git symbolic-ref HEAD)" && echo ${b#refs/heads/}; }; wb"
|
||||||
sha = rev-parse HEAD
|
sha = rev-parse HEAD
|
||||||
branch-or-sha = "!bs() { git which-branch 2> /dev/null || git sha 2> /dev/null ; }; bs"
|
branch-or-sha = "!bs() { git which-branch 2> /dev/null || git sha 2> /dev/null ; }; bs"
|
||||||
# In newer versions of git, this simpler definition of which-branch would work.
|
# In newer versions of git, this simpler definition of which-branch would work.
|
||||||
# symbolic-ref HEAD --short
|
# symbolic-ref HEAD --short
|
||||||
|
|
||||||
ffr = "!ffr() { git fetch $1 && git ff origin/$(git which-branch) && git suir; }; ffr"
|
ffr = "!ffr() { git fetch $1 && git ff origin/$(git which-branch) && git suir; }; ffr"
|
||||||
ffo = !git ffr origin
|
ffo = !git ffr origin
|
||||||
reset-origin = "!r() { git reset --hard origin/\"$(git which-branch)\" && git suir; }; r"
|
reset-origin = "!r() { git reset --hard origin/\"$(git which-branch)\" && git suir; }; r"
|
||||||
|
|
||||||
# Credit an author on the latest commit
|
# Credit an author on the latest commit
|
||||||
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
|
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
|
||||||
# Interactive rebase with the given number of latest commits
|
# Interactive rebase with the given number of latest commits
|
||||||
reb = "!r() { git rebase -i HEAD~$1; }; r"
|
reb = "!r() { git rebase -i HEAD~$1; }; r"
|
||||||
# Diff a file or show it in git's pager if it is untracked
|
# Diff a file or show it in git's pager if it is untracked
|
||||||
du = "!d() { git ls-files $1 --error-unmatch 2>/dev/null 1>/dev/null && git diff $1 || `git config --get core.pager` $1; }; d"
|
du = "!d() { git ls-files $1 --error-unmatch 2>/dev/null 1>/dev/null && git diff $1 || `git config --get core.pager` $1; }; d"
|
||||||
clean-branches = "!r() { git branch -r --merged ${1-origin/master} | xargs -n1 git branch -d; }; r"
|
clean-branches = "!r() { git branch -r --merged ${1-origin/master} | xargs -n1 git branch -d; }; r"
|
||||||
clean-remote-branches =
|
rmremotetag = "!rm() { git push $1 :refs/heads/tags/$2; } rm"
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
# Use custom `.gitignore` and `.gitattributes`
|
# Use custom `.gitignore` and `.gitattributes`
|
||||||
excludesfile = ~/.gitignore
|
excludesfile = ~/.gitignore
|
||||||
attributesfile = ~/.gitattributes
|
attributesfile = ~/.gitattributes
|
||||||
pager = less -F -X
|
pager = less -F -X
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
# Use colors in Git commands that are capable of colored output when
|
# Use colors in Git commands that are capable of colored output when
|
||||||
# outputting to the terminal
|
# outputting to the terminal
|
||||||
ui = auto
|
ui = auto
|
||||||
|
|
||||||
[color "branch"]
|
[color "branch"]
|
||||||
@ -80,4 +82,4 @@
|
|||||||
name = Ivan Malison
|
name = Ivan Malison
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
|
Loading…
Reference in New Issue
Block a user