From: Christian Jaeger <christian@jaeger.mine.nu>
To: Jens Neuhalfen <JensNeuhalfen@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: SeLinux integration
Date: Mon, 18 Aug 2008 10:45:10 +0200 [thread overview]
Message-ID: <48A93696.6010500@jaeger.mine.nu> (raw)
In-Reply-To: <6341D084-1A83-4C0F-8C45-943916612D48@gmx.de>
Jens Neuhalfen wrote:
> git://www.neuhalfen.name/git-selinux.git
I'm just an end user, too, so this isn't representing any official
statement, but imho you should clean up your history before you publish
it (and also, I think it would be a good idea to mention that your git
repo is really including the upstream git so that people know they
should use the --reference option to git clone to reuse the contents of
a local upstream git to avoid pulling everything from your server):
- remove commits that don't make sense like your "XXX" file
- generally look over your history again and rework it so that it makes
sense for a receiver (which is not necessarily the historic events of
how you wrote it)
- follow the common commit message format (one line subject, the rest in
the body and line wrapped)
- probably there's no reason to merge your history with historic events
of the upstream git, so you should rebase your history onto some point
of upstream.
You can do this by running
git branch last_upstream 053fd0c1c3da20474c4ff175c56ea4c1d6eeda11
git rebase --interactive last_upstream
(or alternatively (with the advantage that you can open and edit all
patches at the same time, but the disadvantage that editing diffs is
more difficult to get right than editing files in snapshots), by first
creating patch files by running:
git format-patch master...last_upstream
then editing the patch files (and remove those which don't make sense)
and then switch to the upstream branch and run "git-am --3way 00*patch",
or replace 00*patch with the patch files in the order you want them
applied).
Christian.
next prev parent reply other threads:[~2008-08-18 8:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-17 10:44 SeLinux integration Jens Neuhalfen
2008-08-18 8:45 ` Christian Jaeger [this message]
2008-08-18 12:02 ` Jens Neuhalfen
2008-08-18 12:47 ` Christian Jaeger
2008-08-18 13:04 ` Björn Steinbrink
2008-08-18 13:32 ` Petr Baudis
2008-08-18 14:29 ` David P. Quigley
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=48A93696.6010500@jaeger.mine.nu \
--to=christian@jaeger.mine.nu \
--cc=JensNeuhalfen@gmx.de \
--cc=git@vger.kernel.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