git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How to reset selected lines?

From
Pratyush Yadav <me@yadavpratyush.com>
Date
Aug 14, 2019, 11:11 UTC
Message-ID
<20190814111108.lymvzdwicpil53at@localhost.localdomain>
In-Reply-To
<1f31dd2c-3023-2d13-3466-bffabab703cc@kdbg.org>
On 14/08/19 12:07AM, Johannes Sixt wrote:
Show 16 quoted lines
> Am 13.08.19 um 16:18 schrieb Pratyush Yadav:
> > Now, I want to add a similar feature, but one that discards/resets the 
> > selected lines. And I'd like to avoid the hack that git-gui's 
> > apply_range_or_line is. So, is there a cleaner way to do this that does 
> > not involve generating a diff and then applying it?
> 
> Don't waste your time. I'm using this feature since years. It's
> available in these three commits:
> 
> https://github.com/j6t/git/commit/55276690b2bc6a
> https://github.com/j6t/git/commit/f12b294b68b595
> https://github.com/j6t/git/commit/00860615691604
> 
> Thanks go to Bert Wesarg. The patches are also available in this thread:
> 
> https://public-inbox.org/git/cccd6193cf3bfe170e14270204d735a842bb8563.1326116492.git.bert.wesarg@googlemail.com/#t

Thanks for letting me know. I did try a similar change, before asking here, but git-apply complained about corrupt patches, so I thought more work had to be done. I'll look into the patches and see if I can work them into patches fit for merging.

-- 
Regards,
Pratyush Yadav
Previous: Johannes Sixt
Message 7 of 7 in “How to reset selected lines?”
  1. Pratyush YadavAug 13, 2019
  2. Jeff KingAug 13, 2019
  3. Junio C HamanoAug 13, 2019
  4. Pratyush YadavAug 14, 2019
  5. Jeff KingAug 14, 2019
  6. Johannes SixtAug 13, 2019
  7. Pratyush YadavAug 14, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.