Re: [PATCH 4/4] remote: new show output style
Show 9 quoted lines
>
>
> master merges with remote master
> another-branch merges with remote next
> some-other-branch merges with remote master
>
> I could add code to detect whether all the branches merge and then not
> output the space, but, sigh. And I couldn't think of any other
> combination of words that had the same character spacing.
All valid points. But, dang it, I really think intelligently adding that extra space the right thing to do.
It wouldn't be all that tedious -- you could detect the need for the extra space in config_read_branches() the first time type is set to REBASE, no?
> I'm somewhat confused by "w/remote" making sense to non-English
> speakers as it's English output.
Quite right. Julian made the point better than I: it's fairly idiomatic. I think it's reasonable to assume that many users of the English version of git aren't native English speakers.
Plus it throws the alignment with "rebases" lines way off...
Show 6 quoted lines
>> Second, I think it would be good to also change the format of the 'git push'
>> list, for consistency:
>
> I left that out on purpose. The only folks with push refspecs put them
> their manually, and the raw refspec is clearer and more concise than
> any English words can convey. That was my reasoning anyway.
Fair enough.
Thanks again!
M.
Marc Branchaud <marcnarc@xiplink.com>