From b68db0e9d8da11d081377b789e0bae140e009e4b Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Mon, 3 Mar 2014 16:38:49 -0500 Subject: Use common-ancestor notation for bdiff Diff "along" the branch is more useful than absolute state diff between upstream and branch head. --- aliases.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'aliases.gitconfig') 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 -- cgit v1.2.3