qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 1/9] Updated the FSF address in file hw/sh4/sh7750_regs.h


From: Markus Armbruster
Subject: Re: [PATCH 1/9] Updated the FSF address in file hw/sh4/sh7750_regs.h
Date: Thu, 02 Feb 2023 07:37:20 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)

I guess this is your attempt to implement my suggestion to squash your
series into one patch.  It came out as a concatenation of patches in a
single e-mail.  That's not what we mean by "squashing patches" :)

The common tool for squashing patches is git-rebase.  Say your series is
on branch "work", which is based on master.  Then

    $ git-rebase -i master work

If master has advanced since you based branch work on it, this will
advance your branch to be based on current master.  Hence "rebase".

The -i lets you edit the list of commits to be rebased.  It'll show
instruction right in the editor.  Relevant lines:

    # c        pick <commit> = use commit
    [...]
    # s        squash <commit> = use commit, but meld into previous commit
    # f        fixup [-C | -c] <commit> = like "squash" but keep only the 
previous
    #                    commit's log message, unless -C is used, in which case
    #                    keep only this commit's message; -c is same as -C but
    #                    opens the editor

If you keep the first (top-most) commit as "pick", and change the
remainder to "fixup", the patches become one, using the first patch's
commit message.

You'll then have to reword that commit message.  Since you're already
editing a rebase sequence, you may want to do that by changing "pick" to
"reword".

Hope this helps.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]