Git development
 help / color / mirror / Atom feed
From: Jon Seymour <jon.seymour@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: git-work, git-base: an example of how to use it.
Date: Mon, 25 Apr 2011 20:43:12 +1000	[thread overview]
Message-ID: <BANLkTim07-a5VwSAt7_vLMzOES_JZad9DA@mail.gmail.com> (raw)

I haven't had much feedback about git-work, to this point. Peter
Baumann mentioned it was a little hard to grok. So, I have updated my
github fork with a README.md that shows how I use git work  and git
base to manage the README.md and the master branch of my git fork on
github.

The text of the section "HOW I MAINTAIN THIS DOCUMENT" is included
here for the convenience of readers, or you may prefer to read the
formatted version:

   https://github.com/jonseymour/git

Whenever I edit this document, I do the usual:

   git add README.md
   git commit -m "Updates to README"

Then I do:

   git work update jonseymour HEAD~1

The git work command above:
  * updates the jonseymour branch with the last commit,
  * merges that commit with $(git base) and updates $(git base) to
refer to that merge
  * rebases remaining unpublished work on top of the new $(git base)

Then, I publish the new base and the updated topic to github with:

    git push public $(git base):master jonseymour:jonseymour

The net effect is that:

  * My changes to README.md go to my jonseymour branch.
  * My public github branch reflects the work I have stabilised with
git work update - it contains my stable dependencies, but not work in
progress.
  * I keep my work in progress rebased on top of my public github master branch.
  * I keep my unpublished work private.
  * My working tree remains stable - git work update doesn't change
the tree, it only changes the history.

jon.

             reply	other threads:[~2011-04-25 10:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-25 10:43 Jon Seymour [this message]
2011-12-10 15:54 ` git-work, git-base: an example of how to use it Adam Spiers

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=BANLkTim07-a5VwSAt7_vLMzOES_JZad9DA@mail.gmail.com \
    --to=jon.seymour@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox