From 1537633c3725e25b6aa3b2ddea587f92ea77037f Mon Sep 17 00:00:00 2001 From: Jack O'Connor Date: Tue, 8 Jul 2014 16:38:47 -0700 Subject: [PATCH] configure arc to diff against HEAD^ and create branches against origin/master Summary: By default, `arc diff` includes all the changes between the current branch and origin/master. I prefer to do my own squashing, and often my diffs are on top of each other, so `HEAD^` works much better for me. (It's also what we use in fb.) Also by default, `arc feature` creates new branches off of the current head, just like `git branch` does. Since it's just a convenience feature, I'd prefer to have it do the thing that's most convenient for me, and branch off of origin/master instead. When I need something more complicated, I'm not going to be using this wrapper anyway. @sean what are your thoughts on these configs? Reviewers: sean Reviewed By: sean Subscribers: sean Differential Revision: https://phabricator.buildinspace.com/D7 --- .arcconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.arcconfig b/.arcconfig index b1f1a9b..3743d4b 100644 --- a/.arcconfig +++ b/.arcconfig @@ -1,4 +1,6 @@ { "project_id" : "peru", - "conduit_uri" : "https://phabricator.buildinspace.com" + "conduit_uri" : "https://phabricator.buildinspace.com", + "arc.feature.start.default" : "origin/master", + "git.default-relative-commit": "HEAD^" }