diff options
Diffstat (limited to 'configs/shared/.gitconfig')
| -rw-r--r-- | configs/shared/.gitconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/shared/.gitconfig b/configs/shared/.gitconfig index 35082ffcb8f6..dbccffc79a05 100644 --- a/configs/shared/.gitconfig +++ b/configs/shared/.gitconfig @@ -4,7 +4,7 @@ [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 = + changed-files = ! git diff --name-only $(current_branch) $(git merge-base $(current_branch) master) conflicts = 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 |