Newer
Older
autosquash = !GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash $(git last-commit)^
autorebase = -c 'core.editor=true' rebase -i --autosquash
bull = submodule update --remote --init
cleaan = clean -fdX
cleaaan = clean -fdx
dif = diff --color-words
empty-commit = commit --allow-empty
nimrod
committed
exec = "!exec "
ff = merge --no-edit --ff-only master
fixup = !git commit --fixup $(git last-commit)
last-commit = "!git log --no-merges --abbrev-commit --format=\"%h %s\" | awk '{if ($2 != \"fixup!\" && $2 != \"squash!\") {print $1; exit}}'"
merg = merge --no-edit
posh = push --set-upstream origin HEAD
pul = pull --progress
pull-force = !git fetch && git reset --hard "$(git tracking)"
push-force = push --force-with-lease
pushes = !git remote | xargs -n1 git push
root = rev-parse --show-toplevel
serve-git = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
serve-http = !git update-server-info && cd .git && python -m SimpleHTTPServer
squash = !git commit --squash $(git last-commit)
staash = stash --all
stat = status --short --branch
tag-version = !git tag --annotate --force --message "v$(cat VERSION)" "v$(cat VERSION)"
tracking = rev-parse --abbrev-ref --symbolic-full-name @{upstream}
trigger = !git commit --allow-empty --no-edit --amend && git push --force-with-lease
[color]
grep = true
[fetch]
fsckobjects = true
prune = true
[merge]
tool = meld
ff = false
[push]
followTags = true
[receive]
fsckObjects = true
[tag]
forceSignAnnotated = true
[transfer]
fsckobjects = true
[user]
name = Adar Nimrod
email = nimrod@shore.co.il
signingKey = E3AE9CD4B8EA564BF746CD909C53CFCB9AAA2526