[PATCH V2] New whole and dependencies

[chris hermansen]

As always, thank you for the kind guidance.  A comment at the end...

On Tue, Jul 14, 2026 at 8:42 AM Jose E. Marchesi <jemarch@gnu.org> wrote:
>
>
> > Good morning everyone,
> >
> > On Tue, Jul 14, 2026 at 3:22 AM Jose E. Marchesi <jemarch@gnu.org> wrote:
> >>
> >>
> >> Hello Chris.
> >>
> >> This seems to be a diff done against the first version of the patch.
> >
> > I believe that's correct.
> >>
> >> What we need is a diff against the master branch.  This basically means
> >> that when you roll out a new version of the patch (or patch series) you
> >> have to rebase.
> >>
> >> Supposing you have your work in a branch `newwhole', containing one
> >> commit since master (the version V1) a possible workflow to do a V2
> >> could look like this:
> >>
> >>
> >>  $ git branch
> >>  * newwhole
> >>  $ git log --oneline master..HEAD
> >>  abcdef0011 New whole and dependencies   <- this is V1
> >>
> >>  [... do changes for V2 ... ]
> >>  $ git commit -a -m "v2"
> >>  $ git log --oneline master..HEAD
> >>  abcdef0011 New whole and dependencies
> >>  2233445566 v2
> >>
> >>  $ git fetch origin master:master        <- updates master from upstream
> >>
> >>  $ git rebase master                     <- this rebases both commits on
> >>                                             top of latest master
> >>  $ git rebase -i master                  <- to squash both commits into one
> >>
> >>  $ git format-patch master..HEAD         <- to generate patch files
> >
> > I have followed this workflow and now when I git log I see:
> > ---------------------
> > commit 2c56a6a541373013b6877e977bfc082805636a69 (HEAD -> ch_whole)
> > Author: Chris Hermansen <chris.hermansen@nuevaconsulting.com>
> > Date:   Mon Jul 13 20:32:23 2026 -0700
> >
> >     New whole and dependencies
> > ...
> >
> > commit cddf9bf17b8dc838cfd9e63d4d257b8e5ccf2003
> > Author: Chris Hermansen <chris.hermansen@nuevaconsulting.com>
> > Date:   Sun Jul 12 18:02:04 2026 -0700
> >
> >     New version of proc whole and dependencies
> >
> > commit 929b1c42f3d23dcffacdedb005ab83d3607b47ce (origin/master,
> > origin/HEAD, master)
> > Author: Tobias Burnus <tburnus@baylibre.com>
> > Date:   Tue Jul 14 16:09:54 2026 +0200
> > --------------------------
> > Please pardon my ineptness with git... does this look right?  I still
> > have two patch files, but they
> > have been updated...
> >
> > Shall I send them?
> >
> > [old patch deleted]
>
> When you run
>
> $ rebase -i master
>
> You will be presented with a buffer in your editor of choice (set in
> the EDITOR environment variable) with a list of commits.  This is a git
> interactive-rebase.  Basically you mark which commits you want to smash
> together, by prefixing them with (I seem to recall) F prefix, and you
> can you can also reorder the lines around to change the order of
> application of the patches in the branch.  Then when you save and exit
> the editor, git will perform the requested opertions.
>
> In this case we want to squash commit 929b1c42f3 into 2c56a6a5f1.
>
> See INTERACTIVE MODE in the git-rebase(1) manual page..

I found this https://git-scm.com/docs/git-rebase.html#_interactive_mode

which suggested keeping the "pick" on the line to keep and "squash" or
"fixup" on the
lines to merge; I chose "squash".  I created the new (squashed) patch
and sent it
in a separate email.

Thanks again, and thanks to all on this list for bearing with my git stumblings.
-- 
Chris Hermansen · clhermansen "at" gmail "dot" com

C'est ma façon de parler.