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

Todd Zullinger tmz at pobox.com
Wed Apr 1 20:32:06 UTC 2009

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.

> 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

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.  (I'm
just a user of git though, I don't maintain any public projects of any
consequence with git.)

¹ http://git.kernel.org/?p=git/git.git;a=blob_plain;f=MaintNotes;hb=todo
² http://www.kernel.org/pub/software/scm/git/docs/howto/maintain-git.txt

Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
I look up to the heaven's for a ray of hope to shine.
And there it is in neon: Liquor, beer, and wine.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 542 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/bash-completion-devel/attachments/20090401/bcaddaf0/attachment.pgp 

More information about the Bash-completion-devel mailing list