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

Re: Newbie falls at first hurdle

From
SVSven Verdoolaege <skimo@kotnet.org>
Date
Sep 19, 2005, 19:09 UTC
Message-ID
<20050919190947.GF15165MdfPADPa@greensroom.kotnet.org>
In-Reply-To
<200509182011.10689.alan@chandlerfamily.org.uk>
On Sun, Sep 18, 2005 at 08:11:10PM +0100, Alan Chandler wrote:
> What I was then trying to do, via various attempts with git diff -p was to 
> extract small chunks of updates (ie limit scope over a few files).  Edit the 
> result to limit the diff to cover a small update and then apply it to a my 
> current stuff to slowly undo some of the mess that I had made.

Yoy may find my changes to dirdiff useful if you do things like that. (http://www.liacs.nl/~sverdool/gitweb.cgi?p=dirdiff.git;a=summary) I've basically changed it to allow "merging" (i.e., commiting) to a branch.

You'd start it like this
girdiff master .

Then you loop through the files with differences, for each file selecting the changes you want to copy and selecting Merge/"update master". Then you fill in a commit message and select File/Commit from the commit message window.

Only lightly tested so far. Rediff'ing doesn't work yet, so you'll have to restart girdiff after each commit for now.

skimo
Previous: Junio C HamanoNext: Martin Langhoff
Message 9 of 13 in “Re: Newbie falls at first hurdle”
  1. Horst von BrandSep 18, 2005
  2. Martin LanghoffSep 18, 2005
  3. Alan ChandlerSep 18, 2005
  4. Junio C HamanoSep 18, 2005
  5. Linus TorvaldsSep 18, 2005
  6. Junio C HamanoSep 18, 2005
  7. Alan ChandlerSep 18, 2005
  8. Junio C HamanoSep 18, 2005
  9. Sven VerdoolaegeSep 19, 2005
  10. Martin LanghoffSep 18, 2005
  11. Horst von BrandOct 3, 2005
  12. Horst H. von BrandJan 13, 2007
  13. Shawn O. PearceJan 13, 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.