More moving stuff around

This commit is contained in:
2017-10-16 16:05:15 +02:00
parent bade4f97ae
commit 363839b1e2
10 changed files with 23 additions and 5 deletions

19
dev/git/git-on-tree Executable file
View File

@@ -0,0 +1,19 @@
#!/bin/bash
start_rev=$1
end_rev=$2
cmd=$3
function main()
{
revs=`git rev-list --reverse ${start_rev}..${end_rev}`
for rev in $revs; do
git checkout --quiet $rev
eval $cmd
git reset --hard --quiet
done
git checkout ${end_rev}
}
main "$@"

47
dev/git/gitconfig Normal file
View File

@@ -0,0 +1,47 @@
[user]
name = Thomas Lovén
email = thomasloven@gmail.com
[credential]
helper = cache
[color]
ui = auto
branch = auto
diff = auto
status = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow
frag = magenta
old = red
new = green
[color "status"]
added = yellow
changed = green
untracked = cyan
[push]
default = current
[core]
pager = less -F -X
[alias]
st = status
ci = commit
co = checkout
di = diff
dc = diff --cached
wd = diff --word-diff=color
amend = commit --amend
aa = add --all
b = branch
updateall = submodule foreach 'git pull'
l = !prettygit
p = "!echo $PATH"
la = !git l --all
r = !git l -30
ra = !git r --all
[merge]
tool = vimdiff

38
dev/git/gitignore_global Normal file
View File

@@ -0,0 +1,38 @@
*.com
*.class
*.dll
*.exe
*.o
*.so
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.log
*.sql
*.sqlite
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
#Latex files
*.aux
*.bcf
*.blg
*.fdb_latexmk
*.fls
*.out
tags

19
dev/git/prettygit Executable file
View File

@@ -0,0 +1,19 @@
#!/bin/bash
HASH="%C(yellow)%h%C(reset)"
RELATIVE_TIME="%C(green)%ar%C(reset)"
AUTHOR="%C(blue)<%an>%C(reset)"
REFS="%C(red)%d%C(reset)"
SUBJECT="%C(reset)%s%C(reset)"
FORMAT="}$HASH}$RELATIVE_TIME}$AUTHOR}$REFS $SUBJECT"
function pretty_git_log() {
git log --graph --all --color=always --pretty="tformat:$FORMAT" $* |
sed -Ee 's/(^[^<]*) ago}/\1}/' |
columnize -t -s '}' |
less -FXR
}
# grep -v Merge |
pretty_git_log $@

29
dev/git/setup.sh Executable file
View File

@@ -0,0 +1,29 @@
#!/usr/bin/env bash
source ${DOTFILES}/helpers.sh
function main()
{
local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
print_info "Configuring git"
brewget git
if [ ! -f "${HOME}/.gitconfig" ]; then
cat << EOF > ${HOME}/.gitconfig
[include]
path = ${scriptdir}/gitconfig
[core]
excludesfile = ${scriptdir}/gitignore_global
EOF
fi
makedir ${HOME}/bin
linkfile ${scriptdir}/prettygit ${HOME}/bin/prettygit
linkfile ${scriptdir}/git-on-tree ${HOME}/bin/git-on-tree
print_ok "Git configured"
}
main "$@"

20
dev/setup.sh Executable file
View File

@@ -0,0 +1,20 @@
#!/usr/bin/env bash
source ${DOTFILES}/helpers.sh
function main()
{
local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
print_info "Preparing development environment"
${scriptdir}/git/setup.sh
brewget vim --with-override-system-vi
caskget docker
print_ok "Development environment setup"
}
main "$@"