[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git workflow overview
From: |
Han-Wen Nienhuys |
Subject: |
Re: Git workflow overview |
Date: |
Fri, 28 Mar 2008 01:36:46 -0300 |
User-agent: |
Thunderbird 2.0.0.12 (X11/20080226) |
Ludovic Courtès escreveu:
> # hack the thing...
> $ git-commit -a -m "The fix."
> $ git-pull # Check whether we're up-to-date.
> $ git-push
> $ git-checkout branch_release-1-8
> $ git-pull # Update.
> $ git-cherry-pick master # Apply the change we made in `master'.
> # fix any conflicts...
> $ git-push # Push the change to `branch_release-1-8'.
The dashed forms are being deprecated, so it should be
git commit
git pull
--
Han-Wen Nienhuys - address@hidden - http://www.xs4all.nl/~hanwen