[apply] whitespace = fix [alias] amend = commit --amend autorebase = -c 'core.editor=true' rebase -i --autosquash --autostash bull = submodule update --remote --init cleaan = clean -fdX cleaaan = clean -fdx dif = diff --color-words empty-commit = commit --allow-empty exec = "!${SHELL:-/bin/sh} -ic " ff = merge --no-edit --ff-only master fixup = !cd "${GIT_PREFIX:-$PWD}" && git commit --fixup $(git last-commit) forget = reset HEAD^ merg = merge --no-edit posh = push --set-upstream origin HEAD Pull = pull --progress --ff --tags pull-force = !git fetch && git reset --hard "$(git tracking)" 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 http.server 8080 shove = push --force-with-lease squash = !cd "${GIT_PREFIX:-$PWD}" && 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 pushes --force-with-lease [color] grep = true ui = auto [core] whitespace = space-before-tab,-indent-with-non-tab,trailing-space [diff] renames = copies tool = meld [difftool] prompt = false [fetch] fsckobjects = true prune = true [grep] linenumber = true [merge] tool = meld ff = false [push] followTags = true default = simple [rebase] autoSquash = true [receive] fsckObjects = true [tag] forceSignAnnotated = true [transfer] fsckobjects = true [user] name = Adar Nimrod email = nimrod@shore.co.il signingKey = E3AE9CD4B8EA564BF746CD909C53CFCB9AAA2526