Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Cristi Magherusan <Cristi.Magherusan@net.utcluj.ro>
To: buildroot@busybox.net
Subject: [Buildroot] package/customize
Date: Wed, 23 Jun 2010 21:06:20 +0300	[thread overview]
Message-ID: <1277316380.24680.10.camel@ufo> (raw)
In-Reply-To: <0D753D10438DA54287A00B027084269763716C4C12@AUSP01VMBX24.collaborationhost.net>

On Wed, 2010-06-23 at 12:03 -0500, H Hartley Sweeten wrote:
> Hello all,
> 
> Is there a way to tag the package/customize directory so that a 
> 'git pull' will ignore it?  I use that directory as a hacking point
> to test/add packages that are not currently in buildroot.  Right
> now, every time I do a git pull I have to copy that directory out
> of my tree and restore the original one before I do a 'git pull' to
> update my tree.
> 
> Thanks,
> Hartley
> _______________________________________________
Hi Hartley,

Why don't you create a feature branches for your stuff, where you can
make commits freely, and track the upstream in another branch. 

Then when one of your feature branches is complete, make a pull request
or send a patch for inclusion in mainline, and delete it after the code
was merged.

Here's a small document that describes such a workflow:
http://www-cs-students.stanford.edu/~blynn/gitmagic/ch04.html

Regards,
Cristi

-- 
Cristi M?gheru?an, alumnus System/Network Engineer
Technical University of Cluj-Napoca, Romania
http://cc.utcluj.ro  +40264 401247
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100623/ccb83d24/attachment.pgp>

      reply	other threads:[~2010-06-23 18:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-23 17:03 [Buildroot] package/customize H Hartley Sweeten
2010-06-23 18:06 ` Cristi Magherusan [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=1277316380.24680.10.camel@ufo \
    --to=cristi.magherusan@net.utcluj.ro \
    --cc=buildroot@busybox.net \
    /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