diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/shared/.gitconfig | 6 | ||||
| -rw-r--r-- | configs/shared/.gitignore | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configs/shared/.gitconfig b/configs/shared/.gitconfig index dbccffc79a05..e6d0e7b9bc47 100644 --- a/configs/shared/.gitconfig +++ b/configs/shared/.gitconfig @@ -4,8 +4,8 @@ [alias] recent = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format=\"%(refname:short)\" today = ! git log --date=relative --since=00:00:00 --all --no-merges --oneline --author=\"$(git config --get user.email)\" - changed-files = ! git diff --name-only $(current_branch) $(git merge-base $(current_branch) master) - conflicts = diff --name-only --diff-filter=U + changed-files = ! git --no-pager diff --name-only $(current_branch) $(git merge-base $(current_branch) master) + conflicts = ! git --no-pager diff --name-only --diff-filter=U yday = ! git log --name-only --since=yesterday.midnight --until=today.midnight --author=\"$(git config --get user.email)\" patch-grep = log -p -S [credential] @@ -17,3 +17,5 @@ autostash = true [github] user = wpcarro +[core] + excludesfile = ~/.gitignore diff --git a/configs/shared/.gitignore b/configs/shared/.gitignore new file mode 100644 index 000000000000..0d9002511ec2 --- /dev/null +++ b/configs/shared/.gitignore @@ -0,0 +1,2 @@ +# Mac +.DS_Store |