Thread (309 messages) 309 messages, 17 authors, 2018-10-02

Re: [PATCH 02/18] Add a new builtin: branch-diff

From: Eric Sunshine <hidden>
Date: 2018-05-04 02:35:42

On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
This builtin does not do a whole lot so far, apart from showing a usage
that is oddly similar to that of `git tbdiff`. And for a good reason:
the next commits will turn `branch-diff` into a full-blown replacement
for `tbdiff`.

At this point, we ignore tbdiff's color options, as they will all be
implemented later and require some patches to the diff machinery.

Signed-off-by: Johannes Schindelin <redacted>
---
diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c
@@ -0,0 +1,40 @@
+static const char * const builtin_branch_diff_usage[] = {
+       N_("git rebase--helper [<options>] ( A..B C..D | A...B | base A B )"),
+       NULL
+};
The formatting of "<options>" vs. "base" confused me into thinking
that the latter was a literal keyword, but I see from reading patch
3/18 that it is not a literal at all, thus probably ought to be
specified as "<base>".
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help