diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index fadc4314..506839af 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -3,18 +3,10 @@ l = log --pretty=oneline -n 20 --graph # View the current working tree status using the short format s = status -s - # Show the diff between the latest commit and the current state - d = !"git diff-index --quiet HEAD -- || clear; git diff --patch-with-stat" - # `git di $number` shows the diff between the state `$number` revisions ago and the current state - di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d" # Clone a repository including all submodules c = clone --recursive # Commit all changes ca = !git add -A && git commit -av - # Switch to a branch, creating it if necessary - go = checkout -B - # Show verbose output about tags, branches or remotes - tags = tag -l branches = branch -a remotes = remote -v # Credit an author on the latest commit @@ -22,52 +14,46 @@ # Interactive rebase with the given number of latest commits reb = "!r() { git rebase -i HEAD~$1; }; r" suir = submodule update --init --recursive - + poh = push origin HEAD + [core] # Use custom `.gitignore` and `.gitattributes` excludesfile = ~/.gitignore attributesfile = ~/.gitattributes - # Treat spaces before tabs, lines that are indented with 8 or more spaces, and all kinds of trailing whitespace as an error - whitespace = space-before-tab,indent-with-non-tab,trailing-space pager = less -F -X [color] - # Use colors in Git commands that are capable of colored output when outputting to the terminal + # Use colors in Git commands that are capable of colored output when + # outputting to the terminal ui = auto + [color "branch"] current = yellow reverse local = yellow remote = green + [color "diff"] meta = yellow bold frag = magenta bold old = red bold new = green bold + [color "status"] added = yellow changed = green untracked = cyan -# Use `origin` as the default remote on the `master` branch in all cases -[branch "master"] - remote = origin - merge = refs/heads/master - -# URL shorthands -[url "git@github.com:"] - insteadOf = "gh:" - pushInsteadOf = "github:" - pushInsteadOf = "git://github.com/" -[url "git://github.com/"] - insteadOf = "github:" [url "git@gist.github.com:"] insteadOf = "gst:" pushInsteadOf = "gist:" pushInsteadOf = "git://gist.github.com/" + [url "git://gist.github.com/"] insteadOf = "gist:" + [user] email = IvanMalison@gmail.com name = Ivan Malison + [merge] conflictstyle = diff3 \ No newline at end of file