Thread (30 messages) flat view 30 messages, 3 authors, 2016-06-15

Re: Reusing changes after renaming a file (Re: [PATCH 5/6] sequencer: Expose API to cherry-picking machinery)

From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:51:48

Ramkumar Ramachandra wrote:
$ git cherry-pick -Xrename-threshold=90 sequencer~1
[test 7400609] sequencer: Expose API to cherry-picking machinery
 3 files changed, 256 insertions(+), 1247 deletions(-)
 rewrite builtin/revert.c (81%)
 rename builtin/revert.c => sequencer.c (81%)

Is it supposed to influence the diffstat?  I don't see any conflict
markers in sequencer.c.  I can see lots of unintelligent (and useless)
conflict markers in builtin/revert.c.
Perhaps "git merge-recursive" and its callers don't use the equivalent
of -B, so it doesn't look like a rename to them.  Cases involving
plain renames work fine for me.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help