[wish] Revert changes in git gui

[wish] Revert changes in git gui

[Christoph Grüninger]

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

Re: [wish] Revert changes in git gui

[Johannes Sixt]

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

-- Hannes

Re: [wish] Revert changes in git gui

[Bert Wesarg]

On Tue, Dec 9, 2014 at 9:21 PM, Johannes Sixt <j6t@kdbg.org> wrote:
> 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

Re: [wish] Revert changes in git gui

[Christoph Grüninger]

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:
>
> Maybe this is easier to apply:
> 
> http://repo.or.cz/w/git-gui/bertw.git/commit/5d7a81b626c34a94c6c43937d8a64572b6231196
> 
> Bert 

Re: [wish] Revert changes in git gui

[Bert Wesarg]

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
>

Re: [wish] Revert changes in git gui

[Christoph Grüninger]

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?
> 
> Bert

Re: [wish] Revert changes in git gui

[Philip Oakley]

From: "Christoph Grüninger" <foss@grueninger.de>
> 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

Re: [wish] Revert changes in git gui

[Stefan Haller]

Christoph Grüninger <foss@grueninger.de> wrote:

> 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/