Bureaucrats, confirmed, Administrators
4,558
edits
Changes
adds example .gitconfig
git config --global --add color.ui true
</source>
=== Example .gitconfig ===
<code>git config --global -e</code> and paste in the following:
<source lang="ini">
[user]
name = Greg Rundlett
email = greg@freephile.com
[alias]
co = checkout
ci = commit
unstage = reset HEAD
wu = log --stat origin..@{0}
wup = log -p origin..@{0}
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
[core]
excludesfile = /home/greg/.gitignore_global
editor = vim
[color]
ui = true
[credential]
helper = cache --timeout=3600
# ------------------ M E R G E -------------------------
[merge]
tool = meld
[mergetool "meld"]
cmd = meld --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\" --label \"MERGE (REMOTE BASE MY)\"
trustExitCode = false
[mergetool]
# don't ask if we want to skip merge
prompt = false
# don't create backup *.orig files
keepBackup = false
# ------------------ D I F F -------------------------
[diff]
guitool = meld
[difftool "meld"]
cmd = meld \"$LOCAL\" \"$REMOTE\" --label \"DIFF (ORIGINAL MY)\"
[push]
default = simple
[gitreview]
remote = origin
[help]
format = web
[web]
# browser = google-chrome
browser = firefox
</source>
{{Highlight
|text = If you want to browse the git help in your browser (as above), then make sure you <code>sudo apt-get install git-doc</code> to get the HTML files}}
== Tools ==