view .gitconfig @ 922:74dc16f074be

ignore ff merges
author Jeff Hammel <k0scist@gmail.com>
date Thu, 03 Oct 2024 05:36:19 -0700
parents 06d2cc0fe045
children fc88a12acf48
line wrap: on
line source

[core]
	excludesfile = /home/jhammel/.gitignore
[user]
	name = Jeff Hammel
	email = jhammel@brightsign.biz
	signingkey = /Users/jhammel/.ssh/id_rsa.pub
[alias]
        branches = branch -a
        current-branch = rev-parse --abbrev-ref HEAD
        discard = reset HEAD --hard
        graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cd)%Creset' --abbrev-commit --date=relative
        lo = log --oneline
        patch = !git diff > ~/$(git rev-parse --abbrev-ref HEAD).diff
        pushbranch = !git push origin $(git rev-parse --abbrev-ref HEAD)
        root = rev-parse --show-toplevel
        st = status
        subscribe-pulls = !"f() { REMOTE=${1:-origin}; if ! git config --local --get-all remote.${REMOTE}.fetch | grep -q refs/pull; then echo 'subscribing...' 2>&1; git config --local --add remote.${REMOTE}.fetch '+refs/pull/*/head:refs/remotes/pr/*'; fi; }; f"
        undo = reset HEAD~
        up = !git pull origin master && git push origin master
        wip = !git commit -a -m 'wip' && git push origin $(git rev-parse --abbrev-ref HEAD)

[credential]
        helper = cache --timeout=10000
[diff]
	submodule = log
[branch]
	autosetuprebase = always
[init]
	defaultBranch = main
[fetch]
	recurseSubmodules = on-demand
[status]
	submoduleSummary = true
[gpg]
	format = ssh
[merge]
	ff = no