Sam Ravnborg <sam@xxxxxxxxxxxx> writes: > On Tue, Apr 10, 2007 at 01:52:46PM -0700, Junio C Hamano wrote: >> >> People occasionally ask "how would I make a small fix to a >> commit that is buried in the history", so let me take a moment >> to give them a recipe. > > That recipe looks ummm complicated... > What I usually do is: > > git format-patch HEAD~4..HEAD > git reset --hard HAED~4 > patch -p1 < 0004* > ...edit... > delete diff from 0004* > git diff >> 0004* > git reset --hard > git am 000* > > > Maybe this is as complicated as your example but this > is very simple to deal with. > And I do not destroy history or anything. > > But that said I do not use topic brances but simply > clone my local repository as needed. > And I always deal with a linear history. > > > [I post this mostly to check if this is insane > and I need to understand the way you propose to do stuff] It's really the same. You keep 000* file, I keep them in the original branch and have "git rebase" take care of the details. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html