[LRUG] git question

[Taryn East]

2009/8/20 Chris Mear <chrismear at gmail.com>

>
> Yes, it is way less easy if you're putting yourself in a situation where
> you've having to cherry-pick individual commits to put into a patch. You
> really, really want to set things up so that all your related commits are in
> a branch by themselves, off master. Not only does that make it easier to
> keep track of things while you're working on a feature (or multiple features
> on multiple branches), it also means you can get a patch for those commits
> just by doing:
>
> git format-patch master --stdout > your-patch-file.diff
>
> If you can explain why you needed to pull out individual commits and
> combine them into a patch, then we can suggest ways you can reorganise your
> branches to make this easier in future.


that's easy - because I was too much of a noob to know that I needed to
branch for each feature and was doing all my work on master ;)

This conversation has helped me figure out the "accepted workflow"...

Taryn
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lrug.org/pipermail/chat-lrug.org/attachments/20090820/e7176f5a/attachment-0003.html>