From: Nick Dokos <email@example.com> To: Simon Thum <firstname.lastname@example.org> Cc: Daniel Dehennin <email@example.com>, firstname.lastname@example.org, email@example.com Subject: Re: [DEV] New git workflow Date: Sat, 24 Mar 2012 15:29:47 -0400 [thread overview] Message-ID: <32435.1332617387@alphaville> (raw) In-Reply-To: Message from Simon Thum <firstname.lastname@example.org> of "Sat, 24 Mar 2012 21:08:13 BST." <4F6E29AD.email@example.com> Simon Thum <firstname.lastname@example.org> wrote: > Hi Daniel, > > On 03/24/2012 12:05 PM, Daniel Dehennin wrote: > > Simon Thum<email@example.com> writes: > > It seems that one problem with cherry-picking is the tracking of what is > > in which branch and from where it comes. > > > > I'm not a git neither DVCS guru, but daggyfixes is saner than > > cherry-picking. > > I'm a bit biased as I mainly have git experience but to me it seems > that both cherry-picking and daggy fixes have their strengths and > weaknesses, and I'd rather have them both in all the VCSes but > needless fights over which one is ultimately superior. Git should > probably learn that thing, IMO. > I'm probably missing something but what's there to learn? You check out the offending commit, make a branch off of it, commit the fix on the branch, give it a tag (so you can find it easily later on) and then merge it back anywhere you want. AFAICT, that's all there is to daggy-fixes and git is perfectly capable of doing that - no? Nick > > > > Footnotes: > >  http://mercurial.selenic.com/wiki/DaggyFixes > > > >  http://wiki.monotone.ca/DaggyFixes/ > > > >  http://stackoverflow.com/questions/2922652/git-is-there-a-way-to-figure-out-where-a-commit-was-cherry-picked-from > > > >
next prev parent reply other threads:[~2012-03-24 19:29 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-20 0:51 Bastien 2012-03-20 7:03 ` Achim Gratz 2012-03-20 7:24 ` Achim Gratz 2012-03-20 10:40 ` Bastien 2012-03-20 19:20 ` Achim Gratz 2012-03-21 0:02 ` Bastien 2012-03-21 0:23 ` Bastien 2012-03-20 10:47 ` Bastien 2012-03-20 22:35 ` Simon Thum 2012-03-20 22:27 ` Achim Gratz 2012-03-21 8:46 ` Simon Thum 2012-03-21 9:01 ` Achim Gratz 2012-03-21 22:38 ` Simon Thum 2012-03-24 11:05 ` Daniel Dehennin 2012-03-24 20:08 ` Simon Thum 2012-03-24 19:29 ` Nick Dokos [this message] 2012-04-01 9:26 ` Simon Thum
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.orgmode.org/ * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=32435.1332617387@alphaville \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [DEV] New git workflow' \ /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
Code repositories for project(s) associated with this inbox: https://git.savannah.gnu.org/cgit/emacs/org-mode.git 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).