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

Re: [PATCH v2] user-manual: mention git gui citool (commit, amend)

From
Steffen Prohaska <prohaska@zib.de>
Date
Aug 5, 2007, 19:47 UTC
Message-ID
<5AB64D44-2324-4A98-B010-8D6D6225F116@zib.de>
In-Reply-To
<85wswa6n1o.fsf@lola.goethe.zz>
On Aug 5, 2007, at 5:03 PM, David Kastrup wrote:
Show 33 quoted lines
> Steffen Prohaska <prohaska@zib.de> writes:
>
>> On Aug 5, 2007, at 3:58 PM, Johannes Schindelin wrote:
>>
>>> Hi,
>>>
>>> On Sun, 5 Aug 2007, Steffen Prohaska wrote:
>>>
>>>> git gui is especially useful because it allows to select diff  
>>>> hunks.
>>>
>>> You should give a _big_ _fat_ _red_ warning there.
>>>
>>> If you selectively commit diff hunks, you _never_ tested what you
>>> committed.
>>>
>>> That is the reason we're not advertising git add -i more actively.
>>
>> Hmm... If you do 'git cherry-pick' or 'git rebase' you also did
>> not test what you committed. Should we advertise them less
>> actively as well?
>
> Selectively committing diff hunks also means that a subsequent rebase
> -i or git-cherry will have to reconsider the same commit as it has
> only been incompletely applied.
>
> So it can mean more work later.  Also one would in general have to
> edit the commit message (if it describes everything that has been
> done).
>
> There are simply consequences for the workflow if you do things
> right.  Whether they are worth a "big fat red warning" is one
> question, but mentioning them is probably not amiss.

I found it quite useful to be able to commit diff chunks selectively. I started editing diffs as described in [1] but actually it turned out to be easier for me to use git gui. I'm speaking unified diff probably less fluently than Linus does.

My note about using git gui to select diff hunks is added to the section 'Reordering or selecting from a patch series', which is in my opinion the right section.

But apparently there's some dispute about usefulness of my comment on cherry-picking. Maybe a separate section on rewriting changes would be useful, which I do not have the time to start right now.

Junio, maybe you want to take only the first part of my patch?
	Steffen
[1] http://thread.gmane.org/gmane.comp.version-control.git/46733
Previous: David KastrupNext: Johannes Schindelin
Message 13 of 34 in “user-manual: mention git gui citool (commit, amend)”
  1. user-manual: mention git gui citool (commit, amend)Steffen Prohaska, Jul 30, 2007
  2. Shawn O. PearceJul 31, 2007
  3. J. Bruce FieldsAug 2, 2007
  4. Steffen ProhaskaAug 2, 2007
  5. J. Bruce FieldsAug 2, 2007
  6. Steffen ProhaskaAug 3, 2007
  7. J. Bruce FieldsAug 3, 2007
  8. user-manual: mention git gui citool (commit, amend)Steffen Prohaska, Aug 5, 2007
  9. Johannes SchindelinAug 5, 2007
  10. Steffen ProhaskaAug 5, 2007
  11. Johannes SchindelinAug 5, 2007
  12. David KastrupAug 5, 2007
  13. Steffen ProhaskaAug 5, 2007
  14. Johannes SchindelinAug 6, 2007
  15. Steffen ProhaskaAug 6, 2007
  16. Steven GrimmAug 6, 2007
  17. Johannes SchindelinAug 6, 2007
  18. J. Bruce FieldsAug 5, 2007
  19. J. Bruce FieldsAug 5, 2007
  20. Johannes SchindelinAug 6, 2007
  21. J. Bruce FieldsAug 6, 2007
  22. Robin RosenbergAug 6, 2007
  23. J. Bruce FieldsAug 6, 2007
  24. Shawn O. PearceAug 3, 2007
  25. J. Bruce FieldsAug 3, 2007
  26. Shawn O. PearceAug 4, 2007
  27. Steffen ProhaskaAug 5, 2007
  28. Junio C HamanoAug 3, 2007
  29. Shawn O. PearceAug 3, 2007
  30. J. Bruce FieldsAug 3, 2007
  31. Shawn O. PearceAug 4, 2007
  32. David KastrupAug 4, 2007
  33. J. Bruce FieldsAug 4, 2007
  34. Steffen ProhaskaAug 5, 2007

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.