On 2014-01-08 17:14, Jed Brown wrote:
"Garth N. Wells" <[email protected]> writes:
$ git checkout master
$ git branch -r --merged
the right and safe way to get a list of branches that have been merged
into master?
Yes, though beware this will include origin/master and perhaps
origin/maint if you have such a thing. You don't have to checkout
master with
$ git branch -r --merged master
Do you have a script for deleting merged branches that excludes
origin/master, etc?
Garth
$ git branch -r --merged
doesn't list logg/topic-ccfem. Can you double check that it doesn't
list
any of your active branches? 'git branch -r --no-merged' does show up
logg/topic-ccfem.
It has new commits that haven't been merged:
$ git log --oneline ..origin/logg/topic-ccfem
965d815 Add demo demonstrating triangulation of mesh intersections
1d04ec5 Cleanup unit test for triangulation
f6e989b Rethink triangulation of triangle-triangle intersections.
Seems to work now.
2ff8019 Add function Point::squared_norm and move implementation of
both norm() and squared_norm() to header file.
2ed69f4 Bug fixes in triangulation. Still missing some corners.
b5b1433 Return triangulation as flattened array. More convenient than
implementing
OUT_TYPEMAP_STD_VECTOR_OF_STD_VECTOR_OF_SMALL_DOLFIN_TYPE...
09999c6 Initial work on unit test for intersection triangulation
13a309d Add interface for Cell::triangulate_intersection
7866e2c Sort edge collisions before insertion
bfe9f42 Remove stray include
75cc9ba First implementation of triangulation of cell-cell
intersection.
_______________________________________________
fenics mailing list
[email protected]
http://fenicsproject.org/mailman/listinfo/fenics
