Web lists-archives.com

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)




On 09/04/18 11:21, Junio C Hamano wrote:
* pw/add-p-select (2018-03-16) 3 commits
   (merged to 'next' on 2018-03-30 at eae69f5ded)
  + add -p: optimize line selection for short hunks
  + add -p: allow line selection to be inverted
  + add -p: select individual hunk lines

  "git add -p" interactive interface learned to let users choose
  individual added/removed lines to be used in the operation, instead
  of accepting or rejecting a whole hunk.

  Will kick back to 'pu'.

  There was a brief discussion about this topic not doing as good a
  job as it is advertised as---has it been resolved, or do we want to
  run with what we have for now?
  cf. <878ta8vyqe.fsf@xxxxxxxxxxxxxxxxxxx>

I've been working on a re-roll that has handles modified lines better. I'm not sure what to do about the cases where it cannot pair up the insertions and deletions automatically - I think I'll clean up what I've got, post it and see where the discussion goes from there.

Thanks

Phillip