[PATCH] D74990: [arcconfig] Default base to previous revision
Shoaib Meenai via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 21 16:11:50 PST 2020
smeenai added a comment.
In D74990#1887604 <https://reviews.llvm.org/D74990#1887604>, @MaskRay wrote:
> When patching in a Differential, I usually do:
>
> arc patch D74990
> git rebase origin/master
>
>
> Does this change mean I can delete `git rebase origin/master` from my workflow? If yes, strong +1 from me.
I don't think this'll change the default `arc patch` behavior, unfortunately. You can use `arc patch --nobranch` to attempt to patch your current branch instead of creating a new one, although I'm not sure how well that handles rebase conflicts.
What this patch does (and perhaps I should add this to the description), is that previously, if you did something like
... some work
git commit -m 'commit1'
arc diff
... some more work
git commit -m 'commit2'
arc diff
Previously, that second `arc diff` would upload the changes from both commit1 and commit2 into a single Phabricator revision. With this change, it'll only upload the changes from commit2.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D74990/new/
https://reviews.llvm.org/D74990
More information about the llvm-commits
mailing list