ls = log --stat
lp = log --patch
lpw = log --patch --color-words
- ld = show --date=short -s --pretty='format:%h (\"%s\", %ad)' # describe
+ ld = show --date=short --no-patch --pretty='format:%h (\"%s\", %ad)' # describe
a = add
ap = add --patch
au = add --update
# Highlight moved code in a different color.
colorMoved = zebra
+ # Highlight whitespace errors (at the end of the line) in all lines of
+ # a diff; the default shows them only in new lines
+ wsErrorHighlight = old,new,context
+
# Replace "a/" and "b/" prefix in diffs with characters describing the
# context (e.g. "i/"ndex and "w/"ork tree).
mnemonicprefix = true
wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
# Rules to allow diffing of some binary files. Disabled by default to prevent
-# programs from running them on arbitrary files via a .local .gitattributes
+# repositories from running them on arbitrary files via a local .gitattributes
# file. Copy them to .git/config of the repository to enable them.
#
# "sh -c '..' ARGV0" is used when the programs require additional arguments
# Don't create .git/hooks with any sample hooks. Reduces the clutter
# in new git repositories.
templateDir =
+ # Keep the default branch name
+ defaultBranch = master
# NON-GIT SETTINGS