threads / discuss / 38154

[wish] Revert changes in git gui

Subject: [wish] Revert changes in git gui

## tl;dr

8 messages between Dec 9, 2014 and Dec 14, 2014.

replies: 7people: 5as markdown or json

Christoph Grüninger· Dec 9, 2014, 19:49 UTC · lore

Hi Git devs, I have a feature request for git gui:

While browsing the changes, it is very easy to add (or remove) lines or hunks for commit via the context menu. I would like to revert the changes of a line or a hunk in a similar way. I have often white-space or formatting changes I don't want to commit but want them reverted immediately.

Bye Christoph

Johannes Sixt· Dec 9, 2014, 20:21 UTC · re: Christoph Grüninger · lore

Re: [wish] Revert changes in git gui

Am 09.12.2014 um 20:49 schrieb Christoph Grüninger:
Show 5 quoted lines
> While browsing the changes, it is very easy to add (or remove) lines or
> hunks for commit via the context menu. I would like to revert the
> changes of a line or a hunk in a similar way. I have often white-space
> or formatting changes I don't want to commit but want them reverted
> immediately.
I'm using this patch series since it was posted:
http://thread.gmane.org/gmane.comp.version-control.git/188170/focus=188171
-- Hannes
Bert Wesarg· Dec 10, 2014, 07:42 UTC · re: Johannes Sixt · lore

Re: [wish] Revert changes in git gui

On Tue, Dec 9, 2014 at 9:21 PM, Johannes Sixt <j6t@kdbg.org> wrote:
Show 10 quoted lines
> Am 09.12.2014 um 20:49 schrieb Christoph Grüninger:
>> While browsing the changes, it is very easy to add (or remove) lines or
>> hunks for commit via the context menu. I would like to revert the
>> changes of a line or a hunk in a similar way. I have often white-space
>> or formatting changes I don't want to commit but want them reverted
>> immediately.
>
> I'm using this patch series since it was posted:
>
> http://thread.gmane.org/gmane.comp.version-control.git/188170/focus=188171
Maybe this is easier to apply:
http://repo.or.cz/w/git-gui/bertw.git/commit/5d7a81b626c34a94c6c43937d8a64572b6231196
Bert
Christoph Grüninger· Dec 12, 2014, 08:27 UTC · re: Bert Wesarg · lore

Re: [wish] Revert changes in git gui

Hi Bert, your commit is more than half a year old. Do you intent to include that into Git master? If not, what's the reason?

Bye Christoph

Am 10.12.2014 um 08:42 schrieb Bert Wesarg:
Show 6 quoted lines
>
> Maybe this is easier to apply:
> 
> http://repo.or.cz/w/git-gui/bertw.git/commit/5d7a81b626c34a94c6c43937d8a64572b6231196
> 
> Bert 
Bert Wesarg· Dec 12, 2014, 09:28 UTC · re: Christoph Grüninger · lore

Re: [wish] Revert changes in git gui

On Fri, Dec 12, 2014 at 9:27 AM, Christoph Grüninger <foss@grueninger.de> wrote:
> Hi Bert,
> your commit is more than half a year old. Do you intent to include that
> into Git master? If not, what's the reason?

Thats a really odd question to a person who posted this patch to the mailling list the fist place, isn't it? If anything you should have asked the git gui developers and community, why they didn't show interest to have this in master, right?

Bert
>
> Bye
> Christoph
>
Christoph Grüninger· Dec 14, 2014, 18:25 UTC · re: Bert Wesarg · lore

Re: [wish] Revert changes in git gui

Hi Bert, yes and no. I couldn't find a message from you requesting a merge of this patch. Maybe it's me, I am not familiar with the way it works for Git.

@Git developers: Do you consider merging Bert's patch? If not, what's the reason?

Bye Christoph

On 12.12.2014 at 10:28, Bert Wesarg wrote:
Show 11 quoted lines
> On Fri, Dec 12, 2014 at 9:27 AM, Christoph Grüninger <foss@grueninger.de> wrote:
>> Hi Bert,
>> your commit is more than half a year old. Do you intent to include that
>> into Git master? If not, what's the reason?
> 
> Thats a really odd question to a person who posted this patch to the
> mailling list the fist place, isn't it? If anything you should have
> asked the git gui developers and community, why they didn't show
> interest to have this in master, right?
> 
> Bert
Philip Oakley· Dec 14, 2014, 18:25 UTC · re: Christoph Grüninger · lore

Re: [wish] Revert changes in git gui

From: "Christoph Grüninger" <foss@grueninger.de>
Show 25 quoted lines
> Hi Bert,
> yes and no. I couldn't find a message from you requesting a merge of
> this patch. Maybe it's me, I am not familiar with the way it works for
> Git.
>
> @Git developers: Do you consider merging Bert's patch? If not, what's
> the reason?
>
> Bye
> Christoph
>
>
> On 12.12.2014 at 10:28, Bert Wesarg wrote:
>> On Fri, Dec 12, 2014 at 9:27 AM, Christoph Grüninger
>> <foss@grueninger.de> wrote:
>>> Hi Bert,
>>> your commit is more than half a year old. Do you intent to include
>>> that
>>> into Git master? If not, what's the reason?
>>
>> Thats a really odd question to a person who posted this patch to the
>> mailling list the fist place, isn't it? If anything you should have
>> asked the git gui developers and community, why they didn't show
>> interest to have this in master, right?
>>

Hi, Git gui isn't maintained by Junio himself : http://git-blame.blogspot.co.uk/2011/04/note-from-maintainer.html <quote> Although the following are included in git.git repository, they have their own authoritative repository and maintainers:

  a.. git-gui/ comes from git-gui project, maintained by Pat Thoyts:

git://repo.or.cz/git-gui.git </quote>

Perhaps copy the original patch to Pat, with the justifications, reviews and Acks, to see if it's acceptable. -- Philip

Stefan Haller· Dec 10, 2014, 07:54 UTC · re: Christoph Grüninger · lore

Re: [wish] Revert changes in git gui

Christoph Grüninger <foss@grueninger.de> wrote:
Show 5 quoted lines
> While browsing the changes, it is very easy to add (or remove) lines or
> hunks for commit via the context menu. I would like to revert the 
> changes of a line or a hunk in a similar way. I have often white-space
> or formatting changes I don't want to commit but want them reverted 
> immediately.
I would like to have this feature too.

In the meantime, my workaround is to stage the whole file, unstage the hunk(s) or lines that I want to revert, and then choose "Revert Changes" from the Commit menu. A little more awkward than I would like, but it works well (except when you already took some time to selectively stage hunks or lines for the next commit). So yes, a context menu for this would be very welcome.

-- 
Stefan Haller
Berlin, Germany
http://www.haller-berlin.de/

← back to recent threads