git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Shourya Shukla <shouryashukla.oo@gmail.com>
To: keller.steve@gmx.de
Cc: git@vger.kernel.org, Shourya Shukla <shouryashukla.oo@gmail.com>
Subject: Re: Develop a patch series with git?
Date: Tue, 11 Feb 2020 19:10:22 +0530	[thread overview]
Message-ID: <20200211134022.7975-1-shouryashukla.oo@gmail.com> (raw)
In-Reply-To: <trinity-f39d7ed5-e4c9-45fe-944c-b5cb101cfdcd-1581412940557@3c-app-gmx-bap62>

Hello Steve,

> My question is whether there is git functionality to replace quilt.
> Or is the combination of quilt and git common?

I think we can use interactive rebase[1] as well as 'git am'[2] (am = apply mail)
to apply a series of patches from a mailbox.

In the case of, let's say a dependency missing on your end, you can do an
interactive rebase using 'git rebase -i' to edit your _mini-commits_ which
you will be making on applying the patches to include the dependencies. One
can also 'squash' commits together(i.e. meld multiple commits into one) in
case you want a smaller commit history or you think there is a redundancy in
any of your commits.

BTW, I think that 'git quiltimport' is quite old now right? And maybe even
obsolete?

Best,
Shourya Shukla

[1]: https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
[2]: https://git-scm.com/docs/git-am

  reply	other threads:[~2020-02-11 13:40 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-11  9:22 Develop a patch series with git? Steve Keller
2020-02-11 13:40 ` Shourya Shukla [this message]
2020-02-11 20:00 ` Jeff King
2020-02-12  9:02   ` Johannes Schindelin

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=20200211134022.7975-1-shouryashukla.oo@gmail.com \
    --to=shouryashukla.oo@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=keller.steve@gmx.de \
    /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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).