* [Buildroot] package/customize
@ 2010-06-23 17:03 H Hartley Sweeten
2010-06-23 18:06 ` Cristi Magherusan
0 siblings, 1 reply; 2+ messages in thread
From: H Hartley Sweeten @ 2010-06-23 17:03 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Buildroot] package/customize
2010-06-23 17:03 [Buildroot] package/customize H Hartley Sweeten
@ 2010-06-23 18:06 ` Cristi Magherusan
0 siblings, 0 replies; 2+ messages in thread
From: Cristi Magherusan @ 2010-06-23 18:06 UTC (permalink / raw)
To: buildroot
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-23 18:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-23 17:03 [Buildroot] package/customize H Hartley Sweeten
2010-06-23 18:06 ` Cristi Magherusan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox