Skip to content
config 2.11 KiB
Newer Older
[apply]
    whitespace = fix
nimrod's avatar
nimrod committed
[alias]
    amend = commit --amend
    autorebase = -c 'core.editor=true' rebase -i --autosquash --autostash
    bull = submodule update --remote --init
    cdiff = diff --cached
    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
nimrod's avatar
nimrod committed
    fixup = !cd "${GIT_PREFIX:-$PWD}" && git commit --fixup $(git last-commit)
    forget = reset HEAD^
    pop = stash pop
    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
nimrod's avatar
nimrod committed
    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
nimrod's avatar
nimrod committed
    squash = !cd "${GIT_PREFIX:-$PWD}" && git commit --squash $(git last-commit)
nimrod's avatar
nimrod committed
    staash = stash push --all
    staassh = stash push --all --include-untracked
    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
    ui = auto
[core]
    whitespace = space-before-tab,-indent-with-non-tab,trailing-space
nimrod's avatar
nimrod committed
[diff]
nimrod's avatar
nimrod committed
	tool = meld
nimrod's avatar
nimrod committed
[difftool]
	prompt = false
[fetch]
    fsckobjects = true
    prune = true
nimrod's avatar
nimrod committed
[filter "ansible-vault"]
    clean = ANSIBLE_VERBOSITY=0 ansible-vault encrypt
    smudge = ANSIBLE_VERBOSITY=0 ansible-vault decrypt
[grep]
    linenumber = true
[merge]
    tool = meld
    ff = false
[push]
    followTags = true
nimrod's avatar
nimrod committed
    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