Skip to content

Commit 4075d05

Browse files
committed
Initial mck dir and files
1 parent e1f849d commit 4075d05

File tree

3 files changed

+114
-0
lines changed

3 files changed

+114
-0
lines changed

mck/git/git_alias

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
2+
# these would go in your ~/.gitconfig file
3+
4+
[alias]
5+
undo = "!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f"
6+
dt = difftool
7+
vdiff = difftool
8+
difff = diff
9+
dif = diff
10+
last = log -l HEAD
11+
unstage = reset HEAD --
12+
visual = !gitk
13+
merge-s = !git merge --signoff
14+
merge-signed = !git merge --signoff
15+
pull-s = !git pull --signoff
16+
pull-signed = !git pull --signoff
17+
br-name = "!git rev-parse --abbrev-ref HEAD"
18+
ff-upd = "!f() { git merge --signoff --ff-only "origin/$(git br-name)"; }; f"
19+
del-loc-br = "!f() { git branch -D "$@"; }; f"
20+
del-rem-br = "!f() { git push origin --delete "$@"; }; f"
21+
del-all-br = "!f() { git push origin --delete "$@"; git branch -D "$@"; }; f"
22+
alias = "!git config --get-regexp ^alias. | sed 's/^alias.//'"
23+
stat = !git status
24+
smu = !git submodule update --init --recursive

mck/git/gitsetupstream

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
4+
if [[ -z "$branch" ]] ; then
5+
echo "no git branch info found ..."
6+
exit 1
7+
fi
8+
9+
git branch --set-upstream-to=origin/${branch} ${branch}
10+

mck/git/gittrack

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
#!/bin/bash
2+
3+
# functions {{{
4+
function help {
5+
local scriptname="$(basename $0)"
6+
cat >&2 <<EOF
7+
8+
$scriptname [options] [args]
9+
10+
Info about defined upstreams
11+
12+
options:
13+
-v, --verbose Show url for remote
14+
-t, --track Show behind and ahead information
15+
-h, --help Show this help
16+
17+
Examples:
18+
19+
$ $scriptname -v
20+
$ $scriptname -t
21+
22+
EOF
23+
}
24+
# }}}
25+
26+
TEMP=$(getopt -o "vth" -l verbose,track,help -n $(basename $0) -- "$@")
27+
28+
EXIT=$?
29+
if [ $EXIT != 0 ]
30+
then
31+
help
32+
exit $EXIT
33+
fi
34+
35+
# process script arguments
36+
eval set -- "$TEMP"
37+
38+
while true
39+
do
40+
case "$1" in
41+
-v|--verbose)
42+
VERBOSE=yes
43+
;;
44+
-t|--track)
45+
TRACK=yes
46+
;;
47+
-h|--help)
48+
help
49+
exit
50+
;;
51+
--)
52+
shift
53+
break ;;
54+
*)
55+
cat <&2 <<EOF
56+
57+
Error, unknow arguments $1
58+
EOF
59+
help
60+
exit 1
61+
;;
62+
esac
63+
shift
64+
done
65+
66+
entry=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
67+
if [[ -z "$entry" ]] ; then
68+
echo "no git branch info found ..."
69+
exit 1
70+
fi
71+
UPSTREAM=$(git for-each-ref --format='%(upstream:short)' refs/heads/$entry)
72+
if [ "$TRACK" = "yes" ] ; then
73+
TRACK_INFO=" $(git for-each-ref --format='%(upstream:trackshort)' refs/heads/$entry)"
74+
fi
75+
if [ "$VERBOSE" = "yes" ] ; then
76+
REMOTE=${UPSTREAM%/*}
77+
UPSTREAM="$UPSTREAM $(git config --get remote.$REMOTE.url)"
78+
fi
79+
echo "$entry -> $UPSTREAM$TRACK_INFO"
80+

0 commit comments

Comments
 (0)