From: bjorn@mork.no (Bjørn Mork)
To: kernelnewbies@lists.kernelnewbies.org
Subject: Query on git usage for creating patch with incremental commits
Date: Fri, 12 Dec 2014 16:43:58 +0100 [thread overview]
Message-ID: <87oar87u0x.fsf@nemi.mork.no> (raw)
In-Reply-To: <20141212145825.GA5120@gmail.com> (Kumar Amit Mehta's message of "Fri, 12 Dec 2014 15:58:25 +0100")
Kumar Amit Mehta <gmate.amit@gmail.com> writes:
> So far so good, but what If, I am not particularly proud of the first
> patch, but have to send that anyway, If my patches are to be applied.
> Another approach would be to create another branch, say development-again,
> based of origin/master and make the necessary changes and then just
> create one patch file. But I was wondering that while doing development,
> don't we make commits in our working branches, which we think is
> correct, only to find it ridiculous later (say after few more commits
> in future) ? And what to do in such scenario ? Or how to use git to
> solve such scenario.
git rebase is made for things like this. See
http://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
Bj?rn
next prev parent reply other threads:[~2014-12-12 15:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-12 14:58 Query on git usage for creating patch with incremental commits Kumar Amit Mehta
2014-12-12 15:11 ` Manuel Mendez
2014-12-12 15:43 ` Bjørn Mork [this message]
2014-12-12 16:19 ` Mandeep Sandhu
2014-12-12 17:50 ` Kumar Amit Mehta
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=87oar87u0x.fsf@nemi.mork.no \
--to=bjorn@mork.no \
--cc=kernelnewbies@lists.kernelnewbies.org \
/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 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 NNTP newsgroup(s).