[vtk-developers] [Paraview-developers] New git commit hooks

[Marcus D. Hanwell]

On Mon, Apr 26, 2010 at 8:54 AM, David Gobbi <david.gobbi at gmail.com> wrote:

> I've come across a workflow issue that should be added to the Git wiki
> page.  To keep all patches in the correct order, I need to do "git
> pull" before every "git commit".  Even though the commits are local,
> if I do them out-of-order with the changes to the origin/master then
> my push is rejected.
>
> By reflexively doing a "pull" before every "commit", it looks like I
> can keep a very simple workflow that is almost identical to the old
> cvs workflow.
>

This is the most cautious approach, but it is almost equivalent to doing a
'git pull --rebase', this will cause git to replay all of your changes over
whatever was committed (in much the same way svn/cvs update did), and then
you can push with a linear history.

It would be good to collect some of these tips on the wiki if people find
them useful.

Marcus
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20100426/2078e0d9/attachment.html>