Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
94 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
# github:norm/homedir:etc/git/config | ||
# | ||
# Global user preferences for git. | ||
|
||
[github] | ||
user = norm | ||
|
||
[user] | ||
email = norm@201created.com | ||
name = Mark Norman Francis | ||
|
||
[core] | ||
whitespace = -trailing-space | ||
|
||
[color] | ||
branch = auto | ||
diff = auto | ||
status = auto | ||
ui = true | ||
|
||
[color "status"] | ||
added = green | ||
changed = magenta | ||
untracked = cyan | ||
|
||
[merge] | ||
ff = only | ||
tool = opendiff | ||
|
||
[alias] | ||
b = branch | ||
br = "for-each-ref --sort=-committerdate refs/heads/ --format='%(committerdate:short) %(refname:short)'" | ||
cam = commit --amend | ||
camn = commit --amend --no-edit | ||
cf = commit --fixup | ||
ci = commit -v | ||
co = checkout | ||
d = diff | ||
dc = "diff --cached" | ||
l = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative" | ||
lm = ! git l | sed -e '/master)/,$d' | ||
p = push | ||
pf = push --force-with-lease | ||
rba = "rebase --abort" | ||
rbc = "rebase --continue" | ||
rbi = "rebase -i" | ||
s = "status -bs" | ||
|
||
[diff] | ||
algorithm = patience | ||
|
||
[fetch] | ||
prune = true | ||
|
||
[push] | ||
default = simple | ||
|
||
[rebase] | ||
autosquash = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# Files to ignore, taken from https://gist.github.com/octocat/9257657 | ||
|
||
# Compiled source | ||
*.com | ||
*.class | ||
*.dll | ||
*.exe | ||
*.o | ||
*.so | ||
|
||
# Packages | ||
# (it's better to unpack these files and commit the raw source | ||
# git has its own built in compression methods) | ||
*.7z | ||
*.dmg | ||
*.gz | ||
*.iso | ||
*.jar | ||
*.rar | ||
*.tar | ||
*.zip | ||
|
||
# Logs and databases | ||
*.log | ||
*.sql | ||
*.sqlite | ||
|
||
# OS generated files | ||
.DS_Store | ||
.DS_Store? | ||
._* | ||
.Spotlight-V100 | ||
.Trashes | ||
ehthumbs.db | ||
Thumbs.db |