summaryrefslogtreecommitdiff
path: root/aliases.gitconfig
diff options
context:
space:
mode:
authorOwen Jacobson <owen.jacobson@grimoire.ca>2014-03-03 16:38:49 -0500
committerOwen Jacobson <owen.jacobson@grimoire.ca>2014-03-03 16:38:49 -0500
commitb68db0e9d8da11d081377b789e0bae140e009e4b (patch)
tree0dc044a68ecce8e5953115cd22f6c55bb0abac8f /aliases.gitconfig
parent1a3ae2a011bdf31cbe5f8c64a9004fbdb41d3c7e (diff)
Use common-ancestor notation for bdiff
Diff "along" the branch is more useful than absolute state diff between upstream and branch head.
Diffstat (limited to 'aliases.gitconfig')
-rw-r--r--aliases.gitconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/aliases.gitconfig b/aliases.gitconfig
index ba95312..4fc1628 100644
--- a/aliases.gitconfig
+++ b/aliases.gitconfig
@@ -38,7 +38,7 @@
# Branch one-line summary (equivalent to `git blog --oneline`)
bsummary = log --oneline HEAD@{upstream}..HEAD
# Aggregate diff of the current branch: `git bdiff [diff options]`
- bdiff = diff HEAD@{upstream} HEAD
+ bdiff = diff HEAD@{upstream}...HEAD
# Upload a branch to personal fork: `git publish` - note that this
# will unconditionally overwrite the branch if it already exists,
# potentially "losing" changes. Don't `git publish` master. Because of