From: Gaute Hope <eg@gaute.vetsj.com>
To: Ruthard Baudach <ruthard.baudach@web.de>
Cc: supmua <supmua@googlegroups.com>
Subject: Re: [sup] [PATCH] added command line argument to sup invocation: "sup email-address" invokes sup in command line
Date: Sun, 16 Nov 2014 11:25:05 +0000 [thread overview]
Message-ID: <1416136656-astroid-2-jue6bz7l86-1329@strange> (raw)
In-Reply-To: <1416045204-sup-6555@ruthard-lappi>
Excerpts from Ruthard Baudach's message of November 15, 2014 10:57:
>>== Auszüge aus der Nachricht von Gaute Hope vom 2014-11-14 11:13:
>> got a few comments below [btw: it is better to send a completely new
>> patch with your changes squashed together than to send incremental
>> changes to the first patch].
> I really found no way to do this, as far as I understood it, it's
> intentional that format-patch preserves all commits by means of
> incremental patches. I just re-cloned the repository.
Here's my workflow in this case (very quickly jotted down):
- say you have a 'compose-dev' branch with you changes based off
'develop' with incremental commits (the orignal patch, the
refinements, etc)
- (first make sure 'develop' is up-to-date: git checkout develop; git
pull)
- when you're ready to send a pull request or send the patches upstream:
- make a new branch off compose-dev: $ git checkout compose-dev; git checkout -b
compose-dev-polished
- now we need to cleanup this one, also 'develop' might have changed
since you started. so we need to rebase. use rebase -i
(--interactive) against 'develop': git rebase -i develop
- now git will start putting the commits on top of 'develop' as it is
now, there migth be conflicts, resolve them. in the commit message
file that pops up as part of the rebase you can choose to re-order,
re-phrase and squash commits. I typically squash minor refinements,
while if you make two distinct changes they should remain as two
separate commits (you will then send both upstream).
If you need to make further refinements later you can reset your dev
branch to the polished one and keep working there: (git checkout
compose-dev; git reset --hard compose-dev-polished <- careful, will
delete any changes done in compose-dev).
- gaute
prev parent reply other threads:[~2014-11-16 11:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-08 18:37 Ruthard Baudach
2014-11-14 10:13 ` [sup] " Gaute Hope
2014-11-14 21:48 ` Ruthard Baudach
2014-11-16 11:17 ` Gaute Hope
2014-11-15 9:57 ` Ruthard Baudach
2014-11-16 11:25 ` Gaute Hope [this message]
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=1416136656-astroid-2-jue6bz7l86-1329@strange \
--to=eg@gaute.vetsj.com \
--cc=ruthard.baudach@web.de \
--cc=supmua@googlegroups.com \
/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