All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Gordon <peter@pg-consultants.com>
To: git@vger.kernel.org
Subject: Git workflow
Date: Mon, 10 Mar 2008 14:37:43 +0200	[thread overview]
Message-ID: <1205152663.3470.12.camel@tigger> (raw)

Hi.

There are a number of us working on a project. We each have a HEAD, and
work on branches, using git-checkout -b MyPatch. When we have finished
working on the branch, we move back to the HEAD, with 
git-checkout master, do a 
git-pull
and then git-cherry-pick sha1.....

I have two questions. 

1) Is this the normal way to work with git.

2) Also, we sometimes get a log of 
Merge branch 'master' of git://sgit/MyProject which has no commits. Why
does this happen?

Thanks,

Peter

             reply	other threads:[~2008-03-11  1:09 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-10 12:37 Peter Gordon [this message]
2008-03-11  1:58 ` Git workflow Thomas Harning
2008-03-11  5:15 ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2013-11-10 17:01 GIT workflow Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-14 13:20 ` Mikko Rantalainen
2013-11-25 18:26   ` Andrey Borzenkov
2013-11-28  6:45     ` Vladimir 'phcoder' Serbinenko
2013-11-28 17:26       ` Andrey Borzenkov
2013-12-03 12:24         ` Colin Watson

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=1205152663.3470.12.camel@tigger \
    --to=peter@pg-consultants.com \
    --cc=git@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.