[Bash-completion-devel] [Bash-completion-commits] [SCM] bash-completion branch, master, updated. 0f2656669fbdf627a3ddf11bdb72e3ec9cef68fd

[David Paleino]

On Wed, 1 Apr 2009 16:32:06 -0400, Todd Zullinger wrote:

> David Paleino wrote:
> > What are you guys using? What's your development workflow? There
> > shouldn't be any merges in master.
> 
> I'm curious, why not?  There are plenty of merges in the git.git logs.

Just gut feelings, probably there aren't any problems with merges :) I just
encountered problems when trying to cherry-pick, but I shouldn't probably
cherry-pick merges :P...

> > The trick should be using "-n" in git-cherry-pick. Example:
> >
> > mybranch $ [hack] && git commit
> > [aaaaaaa] My log
> > mybranch $ [hack] && git commit
> > [bbbbbbb] My log 2
> > master $ git cherry-pick -n aaaaaaa
> > master $ git cherry-pick -n bbbbbbb
> > master $ git commit
> 
> One disadvantage of using cherry-pick a lot is that it creates a new
> commit, rather than an exact copy of the original commit.  This can
> affect git's merge tracking abilities and makes it harder to tell that
> all commits from a given branch have been merged fully into another
> branch.

Ooh, right.

> I don't know if it'd be useful at all, but the MaintNotes¹ and
> maintain-git.txt² docs have a lot of good information in them.

Thank you for the links!

David

-- 
 . ''`.  Debian maintainer | http://wiki.debian.org/DavidPaleino
 : :'  : Linuxer #334216 --|-- http://www.hanskalabs.net/
 `. `'`  GPG: 1392B174 ----|---- http://snipr.com/qa_page
   `-   2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/bash-completion-devel/attachments/20090401/327c4e21/attachment.pgp