From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Morris <jmorris@namei•org>
Cc: linux-next@vger•kernel.org, Casey Schaufler <casey@schaufler-ca•com>
Subject: Re: linux-next: unsigned commit ...
Date: Fri, 3 Dec 2010 15:46:26 +1100 [thread overview]
Message-ID: <20101203154626.43b4e247.sfr@canb.auug.org.au> (raw)
In-Reply-To: <alpine.LRH.2.00.1012031146480.26585@tundra.namei.org>
[-- Attachment #1: Type: text/plain, Size: 1110 bytes --]
Hi James,
On Fri, 3 Dec 2010 12:21:00 +1100 (EST) James Morris <jmorris@namei•org> wrote:
>
> On Fri, 3 Dec 2010, Stephen Rothwell wrote:
>
> I noticed it and pointed it out to Casey, who is converting over to
> pushing git to me instead of posting patch sets.
OK, so learning, I guess.
> If I'm pulling from someone's repo, it means I trust them enough not to
> need to personally review each line of change.
>
> Can this be fixed with git-commit --amend ?
In Casey's tree it can. But then you would need to remerge his tree into
yours. That would leave us with both versions of the commit in your tree.
If, however, you first do a "git reset --hard HEAD^" on your tree
(assuming that the old merge is still at the top), then it will be like
the old merge was never done. This, however will disrupt anyone who's
tree is built on top of yours and has merged your tree (or rebased on top
of it) while that old merge was there (just like if you rebased your
tree).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
prev parent reply other threads:[~2010-12-03 4:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-02 22:29 linux-next: unsigned commit Stephen Rothwell
2010-12-02 22:38 ` Casey Schaufler
2010-12-03 1:21 ` James Morris
2010-12-03 4:46 ` Stephen Rothwell [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=20101203154626.43b4e247.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=casey@schaufler-ca$(echo .)com \
--cc=jmorris@namei$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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