Skip to content
.gitconfig 1.69 KiB
Newer Older
nimrod's avatar
nimrod committed
[alias]
    amend = commit --amend
nimrod's avatar
nimrod committed
    autosquash = !GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash
    bull = submodule update --remote --init
    clear = clean -fdx
    dif = diff --color-words
    empty-commit = commit --allow-empty
    ff = merge --no-edit --ff-only master
nimrod's avatar
nimrod committed
    fixup = commit --fixup
    forget = reset HEAD^
    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
    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 SimpleHTTPServer
    staash = stash --all
    stat = status --short --branch
    tag-version = !git tag -af "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
    update-requirements = !git stash save -a -u -q && ( git ls-files '*requirements*.txt' | xargs -n1 pur -r ) && ( git commit -a -m '- Updated requirements.' || echo 'No requirements updated.' ) && git stash pop
nimrod's avatar
nimrod committed
    excludesfile = ~/.gitignore_global
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
[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