From: Aaron Schrab <aaron@schrab.com>
To: zsh-workers@zsh.org
Subject: Re: Access to CVS
Date: Thu, 13 Dec 2012 10:50:16 -0500 [thread overview]
Message-ID: <20121213155016.GC372@pug.qqx.org> (raw)
In-Reply-To: <12941.1355403532@thecus.kiddle.eu>
At 13:58 +0100 13 Dec 2012, Oliver Kiddle <okiddle@yahoo.co.uk> wrote:
>+* Do not merge your private feature branches onto the master branch: a
>+ linear history without merge commits is simpler to follow (and to
>+ bisect). Both "git cherry-pick" and "git merge --ff-only" can be used
>+ bring changes over to another branch without a merge commit.
The `--ff-only` option is only somewhat useful here. It merely causes
the merge to be aborted if it can't be done without creating a merge
commit, in which case some other method of bringing in those changes
would need to be tried.
next prev parent reply other threads:[~2012-12-13 15:55 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-04 22:32 Vin Shelton
2012-12-04 22:51 ` Phil Pennock
2012-12-05 0:33 ` Oliver Kiddle
2012-12-05 3:14 ` Phil Pennock
2012-12-05 9:40 ` Bart Schaefer
2012-12-05 11:26 ` Phil Pennock
2012-12-05 12:11 ` Frank Terbeck
2012-12-05 21:13 ` Aaron Schrab
2012-12-05 23:34 ` Aaron Schrab
2012-12-05 19:50 ` Peter Stephenson
2012-12-06 19:59 ` Peter Stephenson
2012-12-07 0:05 ` Aaron Schrab
2012-12-07 7:13 ` Alex Ogier
2012-12-07 9:34 ` Frank Terbeck
2012-12-07 15:11 ` Aaron Schrab
2012-12-07 15:37 ` François Revol
2012-12-07 16:06 ` Aaron Schrab
2012-12-07 9:29 ` Frank Terbeck
2012-12-07 10:57 ` Christian Neukirchen
2012-12-07 11:08 ` Frank Terbeck
2012-12-07 11:38 ` Frank Terbeck
2012-12-07 15:31 ` Bart Schaefer
2012-12-07 16:01 ` Aaron Schrab
2012-12-07 9:49 ` Peter Stephenson
2012-12-07 11:03 ` Frank Terbeck
2013-03-17 14:55 ` Simon Ruderich
2013-04-04 13:38 ` Simon Ruderich
2013-04-05 16:57 ` One-command mail import with X-Seq: and ChangeLog (was: Re: Access to CVS) Frank Terbeck
2013-04-07 19:07 ` Bart Schaefer
2013-04-07 19:48 ` One-command mail import with X-Seq: and ChangeLog Simon Ruderich
2013-04-07 21:08 ` Bart Schaefer
2013-04-07 21:14 ` Frank Terbeck
2013-04-07 21:51 ` Simon Ruderich
2013-04-07 21:08 ` Frank Terbeck
2013-04-08 9:09 ` One-command mail import with X-Seq: and ChangeLog (was: Re: Access to CVS) Mikael Magnusson
2013-04-11 15:10 ` One-command mail import with X-Seq: and ChangeLog Frank Terbeck
2012-12-11 23:05 ` Access to CVS Oliver Kiddle
2012-12-12 8:23 ` Frank Terbeck
2012-12-12 15:31 ` Aaron Schrab
2012-12-12 17:25 ` Oliver Kiddle
2012-12-12 18:57 ` Bart Schaefer
2012-12-13 12:58 ` Oliver Kiddle
2012-12-13 14:57 ` Simon Ruderich
2012-12-13 15:37 ` Bart Schaefer
2012-12-13 16:03 ` Aaron Schrab
2012-12-13 15:50 ` Aaron Schrab [this message]
2012-12-13 16:13 ` Peter Stephenson
2012-12-13 16:20 ` Bart Schaefer
2012-12-13 19:13 ` Phil Pennock
2012-12-14 9:22 ` Frank Terbeck
2012-12-15 18:57 ` Wayne Davison
2012-12-05 2:26 ` Vin Shelton
2012-12-14 14:44 Oliver Kiddle
2012-12-14 15:09 ` Peter Stephenson
2012-12-14 19:29 ` Phil Pennock
2012-12-15 18:09 ` Peter Stephenson
2012-12-15 19:07 ` Wayne Davison
2012-12-15 21:07 ` Aaron Schrab
2012-12-16 9:50 ` Phil Pennock
2012-12-16 18:14 ` Bart Schaefer
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=20121213155016.GC372@pug.qqx.org \
--to=aaron@schrab.com \
--cc=zsh-workers@zsh.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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).