summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Jacobson <owen.jacobson@grimoire.ca>2014-03-03 16:40:28 -0500
committerOwen Jacobson <owen.jacobson@grimoire.ca>2014-03-03 16:40:28 -0500
commitcc78c985678008ab03624a4d830323da5e74a8cc (patch)
treef771eacd4a01350809d43e16f9c098f32fab6f7a
parent9fb9d968c8e9fa21e949cbe43925a23f5513f1a5 (diff)
parentb68db0e9d8da11d081377b789e0bae140e009e4b (diff)
Merge pull request #5 from ojacobson/bdiff-dots
Use common-ancestor notation for bdiff
-rw-r--r--aliases.gitconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/aliases.gitconfig b/aliases.gitconfig
index 30aceac..b1467a1 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