Create a gist now

Instantly share code, notes, and snippets.

@scottnonnenberg /.gitconfig Secret
Last active Jan 17, 2018

What would you like to do?
email =
name = Scott Nonnenberg
prune = fetch --prune
# Because I constantly forget how to do this
undo = reset --soft HEAD^
# Not quite as common as an amend, but still common
stash-all = stash save --include-untracked
# We wanna grab those pesky un-added files!
glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
# No need for a GUI - a nice, colorful, graphical representation
# via
ff = only
# I pretty much never mean to do a real merge, since I use a rebase workflow.
# Note: this global option applies to all merges, including those done during a git pull
conflictstyle = diff3
# Standard diff is two sets of final changes. This introduces the original text before each side's changes.
gpgSign = true
# "other people can trust that the changes you've made really were made by you"
default = simple
# "push the current branch back to the branch whose changes are usually integrated into the current branch"
# "refuse to push if the upstream branch’s name is different from the local one"
followTags = true
# Because I get sick of telling git to do it manually
showUntrackedFiles = all
# Sometimes a newly-added folder, since it's only one line in git status, can slip under the radar.
fsckobjects = true
# To combat repository corruption!
# Note: this global option applies during receive and transmit
# via!topic/binary-transparency/f-BI4o8HZW0
# A nice little github-like colorful, split diff right in the console.
# via
tool = icdiff
prompt = false
[difftool "icdiff"]
cmd = /usr/local/bin/icdiff --line-numbers $LOCAL $REMOTE

Thanks a lot for this. Trying it out now.

FYI you may want to set user.signingkey to your full GnuPG fingerprint.


scottnonnenberg commented Apr 13, 2017

@naftulikay Is there something in particular you're worried about?

felipem775 commented Apr 20, 2017

Thanks, i added some parts to my file.
Another option in my file is:

    [branch "master"]
        mergeoptions = --no-ff


gabeguz commented Apr 20, 2017

Nice, good article and good example. I learned a few things about git!

nice article ;)

this may be of use to someone in here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment