Thread (10 messages) flat view 10 messages, 4 authors, 2016-08-17

Re: git-mergetool reverse file ordering

From: John Keeping <hidden>
Date: 2016-08-14 10:38:12

On Sat, Aug 13, 2016 at 08:42:21PM -0700, David Aguilar wrote:
This use case makes me wonder whether the sorting we do here is
something that should be opened up a bit so that the it's not
quite so set in stone.

For example, an extension to the approach taken by this patch
would be to have `mergetool.reverseOrder` git config boolean
option that would tell us whether or not to use the "-r" flag
when calling sort.

But, IMO that is too rigid, and only addresses this narrow use
case.  What if users want a case-insensitive sort, or some other
preferred ordering?

We can address these concerns, and your use case, by opening it
up. Something like,

	sort=$(git config mergetool.sort || echo sort -u)
Why not reuse the existing diff.orderFile config variable?  (Also
supported by the -O option to git-diff).
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help