On 13 May 2013 15:53, Jed Brown <[email protected]> wrote: > Martin Sandve Alnæs <[email protected]> writes: > >> You can't use "merge" to get a single changeset in git > > Well, you can use 'merge' to get one commit _if_ you already have the > ancestors of that commit.
Of course, but in bzr, you could "merge" a range of changesets without the ancestors, which meant applying the patches introduced by those changesets, effectively the same as cherry-picking in git. Jed: so is it _never_ ok to make even simple fixes directly in next/master/maint? Thanks for the clarifications! Martin _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
