|
|
|
@@ -39,66 +39,68 @@ General git configuration split out into sections mostly. |
|
|
|
#+END_SRC |
|
|
|
** alias |
|
|
|
#+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p)) |
|
|
|
[alias] |
|
|
|
begin = !git init && git commit --allow-empty -m 'Initial empty commit' |
|
|
|
up = !git pull --rebase && git push |
|
|
|
wsd = diff --color-words --ignore-space-at-eol --ignore-space-change --ignore-all-space |
|
|
|
wd = diff --color-words |
|
|
|
fa = fetch --all |
|
|
|
ci = commit |
|
|
|
cia = commit --all |
|
|
|
co = checkout |
|
|
|
ds = diff --stat |
|
|
|
ba = branch --all |
|
|
|
b = branch |
|
|
|
st = status --short --branch |
|
|
|
s = status --short --branch --untracked-files=no |
|
|
|
unstage = reset HEAD |
|
|
|
tlog = log --graph --color=always --abbrev-commit --date=relative --pretty=oneline |
|
|
|
hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
|
|
|
slog = log --oneline --decorate |
|
|
|
fixup = commit --fixup |
|
|
|
squash = commit --squash |
|
|
|
ri = rebase --interactive --autosquash |
|
|
|
ra = rebase --abort |
|
|
|
effit = reset --hard |
|
|
|
bn = rev-parse --abbrev-ref HEAD |
|
|
|
cp = log --no-merges --cherry --graph --oneline |
|
|
|
# What commits differ between branches, note, equivalent commits are omitted. |
|
|
|
# Use this with three dot operator aka master...origin/master |
|
|
|
cpd = log --no-merges --left-right --graph --cherry-pick --oneline |
|
|
|
# Same as ^ only equivalent commits are listed with a = sign. |
|
|
|
cmd = log --no-merges --left-right --graph --cherry-mark --oneline |
|
|
|
# git update with submodule update |
|
|
|
sup = !git pull --rebase && git submodule update --init --recursive |
|
|
|
# git clone with submodules |
|
|
|
sc = !git clone --recursive $1 |
|
|
|
# what files are getting updated a lot descending output |
|
|
|
churn = !git log --all -M -C --name-only --format='format:' "$@" | sort | grep -v '^$' | uniq -c | sort -r | awk 'BEGIN {print "count,file"} {print $1 "," $2}' | egrep -v '^\\s+$' |
|
|
|
# help the gc a bit and get a bit more space back for a local clone |
|
|
|
trim = !git reflog expire --expire=now --all && git gc --prune=now |
|
|
|
# default remote, note depends on the repo having been git cloned |
|
|
|
defremote = !git branch -rvv | egrep 'HEAD' | awk '{print $1}' | sed -e 's|/HEAD||g' |
|
|
|
# short sha |
|
|
|
short = rev-parse --short |
|
|
|
# branch commits on lhs compared to rhs, use via g bcs $(g bn) ^other/branch |
|
|
|
bcs = log --pretty="%H" --first-parent --no-merges |
|
|
|
find-merge = !sh -c "commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 | uniq -f1 -d | sort -n | tail -1 | cut -f2" |
|
|
|
show-merge = !sh -c "merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge" |
|
|
|
# push branch while setting the upstream to the default remote |
|
|
|
pbr = !git push --set-upstream $(git defremote) $(git bn) |
|
|
|
p = !sh -c 'git branch ${1:-$(git defremote)}pr$0@$(iso8601 -s) $(git ls-remote -q ${1:-$(git defremote)} | grep refs/pull-requests/$0/from | cut -c1-8)' |
|
|
|
# kinda/sorta git pull -r without the git pull nonsense |
|
|
|
cleanmerged = !sh -c "git branch --merged | grep -Ev '^(. master|\*)' | xargs -n1 git branch -d" |
|
|
|
prune = !sh -c 'git cleanmerged; git fetch -p; git trim' |
|
|
|
# My defremote hack depends on $remote/HEAD to point to somewhere |
|
|
|
# which it may not if the git repo wasn't cloned |
|
|
|
fixhead = !sh -c "rem=${0:-origin} && branch=${1:-master} && git symbolic-ref refs/remotes/$rem/HEAD refs/remotes/$rem/${branch}" |
|
|
|
# push branch while setting the upstream to the default remote |
|
|
|
pbr = !git push --set-upstream $(git defremote) $(git bn) |
|
|
|
p = !sh -c 'git branch ${1:-$(git defremote)}pr$0@$(iso8601 -s) $(git ls-remote -q ${1:-$(git defremote)} | grep refs/pull-requests/$0/from | cut -c1-8)' |
|
|
|
# Pull all the commits missed from a git pull --depth N clone |
|
|
|
unshallow = pull --unshallow |
|
|
|
[alias] |
|
|
|
begin = !git init && git commit --allow-empty -m 'Initial empty commit' |
|
|
|
up = !git pull --rebase && git push |
|
|
|
wsd = diff --color-words --ignore-space-at-eol --ignore-space-change --ignore-all-space |
|
|
|
wd = diff --color-words |
|
|
|
fa = fetch --all |
|
|
|
ci = commit |
|
|
|
cia = commit --all |
|
|
|
co = checkout |
|
|
|
ds = diff --stat |
|
|
|
ba = branch --all |
|
|
|
b = branch |
|
|
|
st = status --short --branch |
|
|
|
s = status --short --branch --untracked-files=no |
|
|
|
unstage = reset HEAD |
|
|
|
tlog = log --graph --color=always --abbrev-commit --date=relative --pretty=oneline |
|
|
|
hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
|
|
|
slog = log --oneline --decorate |
|
|
|
fixup = commit --fixup |
|
|
|
squash = commit --squash |
|
|
|
ri = rebase --interactive --autosquash |
|
|
|
ra = rebase --abort |
|
|
|
effit = reset --hard |
|
|
|
bn = rev-parse --abbrev-ref HEAD |
|
|
|
cp = log --no-merges --cherry --graph --oneline |
|
|
|
# What commits differ between branches, note, equivalent commits are omitted. |
|
|
|
# Use this with three dot operator aka master...origin/master |
|
|
|
cpd = log --no-merges --left-right --graph --cherry-pick --oneline |
|
|
|
# Same as ^ only equivalent commits are listed with a = sign. |
|
|
|
cmd = log --no-merges --left-right --graph --cherry-mark --oneline |
|
|
|
# git update with submodule update |
|
|
|
sup = !git pull --rebase && git submodule update --init --recursive |
|
|
|
# git clone with submodules |
|
|
|
sc = !git clone --recursive $1 |
|
|
|
# what files are getting updated a lot descending output |
|
|
|
churn = !git log --all -M -C --name-only --format='format:' "$@" | sort | grep -v '^$' | uniq -c | sort -r | awk 'BEGIN {print "count,file"} {print $1 "," $2}' | egrep -v '^\\s+$' |
|
|
|
# help the gc a bit and get a bit more space back for a local clone |
|
|
|
trim = !git reflog expire --expire=now --all && git gc --prune=now |
|
|
|
# default remote, note depends on the repo having been git cloned |
|
|
|
defremote = !git branch -rvv | egrep 'HEAD' | awk '{print $1}' | sed -e 's|/HEAD||g' |
|
|
|
# short sha |
|
|
|
short = rev-parse --short |
|
|
|
# branch commits on lhs compared to rhs, use via g bcs $(g bn) ^other/branch |
|
|
|
bcs = log --pretty="%H" --first-parent --no-merges |
|
|
|
find-merge = !sh -c "commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 | uniq -f1 -d | sort -n | tail -1 | cut -f2" |
|
|
|
show-merge = !sh -c "merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge" |
|
|
|
# push branch while setting the upstream to the default remote |
|
|
|
pbr = !git push --set-upstream $(git defremote) $(git bn) |
|
|
|
p = !sh -c 'git branch ${1:-$(git defremote)}pr$0@$(iso8601 -s) $(git ls-remote -q ${1:-$(git defremote)} | grep refs/pull-requests/$0/from | cut -c1-8)' |
|
|
|
# kinda/sorta git pull -r without the git pull nonsense |
|
|
|
# cleanmerged = !sh -c "git branch --merged | grep -Ev '^(. master|\*)' | xargs -n1 git branch -d" |
|
|
|
prune = !sh -c 'git cleanmerged; git fetch -p; git trim' |
|
|
|
# My defremote hack depends on $remote/HEAD to point to somewhere |
|
|
|
# which it may not if the git repo wasn't cloned |
|
|
|
fixhead = !sh -c "rem=${0:-origin} && branch=${1:-master} && git symbolic-ref refs/remotes/$rem/HEAD refs/remotes/$rem/${branch}" |
|
|
|
# push branch while setting the upstream to the default remote |
|
|
|
pbr = !git push --set-upstream $(git defremote) $(git bn) |
|
|
|
p = !sh -c 'git branch ${1:-$(git defremote)}pr$0@$(iso8601 -s) $(git ls-remote -q ${1:-$(git defremote)} | grep refs/pull-requests/$0/from | cut -c1-8)' |
|
|
|
# Pull all the commits missed from a git pull --depth N clone |
|
|
|
unshallow = pull --unshallow |
|
|
|
# Set the origin to not allow pushing, to be on the safe side. |
|
|
|
nopush = remote set-url --push origin no_push |
|
|
|
#+END_SRC |
|
|
|
** github |
|
|
|
#+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p)) |
|
|
|
@@ -143,13 +145,6 @@ General git configuration split out into sections mostly. |
|
|
|
email = mitch.tishmack@gmail.com |
|
|
|
#+END_SRC |
|
|
|
|
|
|
|
*** for cray |
|
|
|
#+BEGIN_SRC conf :tangle (when (and (eq git-p t) (eq cray-p t)) "tmp/.gitconfig") |
|
|
|
[user] |
|
|
|
name = Mitch Tishmack |
|
|
|
email = mtishmack@cray.com |
|
|
|
#+END_SRC |
|
|
|
|
|
|
|
* ~/.gitignore |
|
|
|
|
|
|
|
Common crap/build artifacts that git should always ignore. |
|
|
|
@@ -169,3 +164,11 @@ Common crap/build artifacts that git should always ignore. |
|
|
|
,*.[oa] |
|
|
|
,*.hi |
|
|
|
#+END_SRC |
|
|
|
|
|
|
|
* Cray overrides |
|
|
|
** ~/.gitconfig |
|
|
|
#+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (and (bound-and-true-p git-p) (bound-and-true-p cray-p))) |
|
|
|
[user] |
|
|
|
name = Mitch Tishmack |
|
|
|
email = mtishmack@cray.com |
|
|
|
#+END_SRC |
Mitch Tishmack
9 jaren geleden