All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
Cc: qemu-devel@nongnu.org,  thuth@redhat.com,
	 ysato@users.sourceforge.jp, alex.bennee@linaro.org,
	 pbonzini@redhat.com,  fam@euphon.net, peter.maydell@linaro.org,
	 philmd@linaro.org,  kwolf@redhat.com, hreitz@redhat.com
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	[thread overview]
Message-ID: <875yckr2sf.fsf@pond.sub.org> (raw)
In-Reply-To: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk> (Khadija Kamran's message of "Wed, 1 Feb 2023 22:33:54 +0500")

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	other threads:[~2023-02-02  6:38 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-01 17:33 [PATCH 1/9] Updated the FSF address in file hw/sh4/sh7750_regs.h Khadija Kamran
2023-02-02  6:37 ` Markus Armbruster [this message]
2023-02-03  4:47   ` Khadija Kamran
  -- strict thread matches above, loose matches on Subject: below --
2023-02-01  7:39 Khadija Kamran
2023-02-01 10:22 ` Alex Bennée
2023-02-01 10:32   ` Khadija Kamran
2023-02-01 12:19 ` Philippe Mathieu-Daudé
2023-02-01 15:47 ` Markus Armbruster
2023-02-01 16:37   ` Khadija Kamran

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=875yckr2sf.fsf@pond.sub.org \
    --to=armbru@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=fam@euphon.net \
    --cc=hreitz@redhat.com \
    --cc=kkamran.bese16seecs@seecs.edu.pk \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=ysato@users.sourceforge.jp \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.