unofficial mirror of guile-devel@gnu.org 
 help / color / mirror / Atom feed
From: ludo@gnu.org (Ludovic Courtès)
To: guile-devel@gnu.org
Subject: Re: Custom printers for SRFI-9 records
Date: Thu, 27 May 2010 00:42:38 +0200	[thread overview]
Message-ID: <87mxvml1y9.fsf@gnu.org> (raw)
In-Reply-To: AANLkTilfCVtGl5arSJZQd7itU6nm7LKHdCMYv8rsF--5@mail.gmail.com

BTW, you should always create a local branch when working on something,
even if it may eventually be committed to ‘master’.  The reason is that
something else may be pushed before your commit, and if you just run
‘git push’ after that, we’ll end up with a merge commit, which we’d
rather avoid.

So the workflow would be:

  $ git branch wip-foo
  $ git checkout wip-foo
  # hack...
  $ git commit ...

  # Check whether something was pushed.
  $ git checkout master
  $ git pull

  # if “already up-to-date”:
  $ git merge wip-foo && git push
  # else
  $ git checkout wip-foo
  $ git rebase master
  # and try again
  # endif

Also I recommend using Magit: <http://zagadka.vm.bytemark.co.uk/magit/>
or <http://github.com/philjackson/magit>.

Thanks,
Ludo’.




  parent reply	other threads:[~2010-05-26 22:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-25  0:26 Custom printers for SRFI-9 records No Itisnt
2010-05-25 19:23 ` Ludovic Courtès
     [not found]   ` <AANLkTilzb959cEaRDcpFUntPK_r0q_9RsIE5pByG4QPm@mail.gmail.com>
2010-05-26  4:18     ` No Itisnt
2010-05-26 21:09       ` No Itisnt
2010-05-26 22:04         ` Ludovic Courtès
2010-05-26 22:42         ` Ludovic Courtès [this message]
2010-05-26 22:34       ` Ludovic Courtès
2010-05-27  2:41         ` No Itisnt
2010-05-27  8:20           ` Ludovic Courtès

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

  List information: https://www.gnu.org/software/guile/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87mxvml1y9.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=guile-devel@gnu.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).