On Oct 3, 2014, at 5:10 PM, git...@crest.iu.edu wrote: > - Log ----------------------------------------------------------------- > https://github.com/open-mpi/ompi/commit/93eba3ac70606db12465319804f2733f13bc9ca4 > > commit 93eba3ac70606db12465319804f2733f13bc9ca4 > Merge: fd6a044 bd2974f > Author: Howard Pritchard <hpprit...@gmail.com> > Date: Fri Oct 3 16:08:11 2014 -0600 > > Merge branch 'master' of https://github.com/open-mpi/ompi
Hey Howard, If possible, please avoid this sort of merge in the future. It usually makes the history a bit harder to follow. A rebase of your local work onto the latest "ompi/master" probably would have been better (though I'm not familiar with the details of this branch+merge). Not a big deal, just a bit friendlier for everyone. It looks like this best practice somehow slipped through the cracks when we put together the OMPI Git documentation, so I've tweaked the wiki to reflect this: https://github.com/open-mpi/ompi/wiki/GitBestPractices FWIW, it causes a commit DAG that looks like this (note the tangle stemming from 93eba3a and bd2974f): ----8<---- * 8191741 (HEAD, origin/master, origin/HEAD, master) tools: add flag to * 23cb00d Merge pull request #225 from hjelmn/master |\ | * eed7b45 osc/rdma: fix issue identified by Berk Hess |/ * 9c027e6 Update the PMI configure logic to handle the oddball case wher * a422d89 memchecker: per RFC, use calloc for OBJ_NEW * 86f1d5a OPAL: drop dead with core on bad flow. rarely happens with hel * cd48fbe Merge pull request #221 from opoplawski/master |\ | * 2d5832c Fix typo in liboshmem name * | 89535a3 OSHMEM: sshmem mmap: use MAP_PRIVATE instead of MAP_SHARED * | 399fc1b configury: remove unneeded assignments * | fd77ebd OSHMEM: sshmem verbs: allocate memory at fixed address * | 4ac5936 OSHMEM: sshmem verbs: improve hca name parsing * | d82dc7f OSHMEM: Add two new mca variables * | 067fa05 OSHMEM: fixes bug in shmem_lock * | 93eba3a Merge branch 'master' of https://github.com/open-mpi/ompi |\ \ | |/ | * bd2974f Merge branch 'master' of ssh://github.com/open-mpi/ompi | |\ | | * 0997c91 openmpi-release.sh: update for git | * | fb1f487 Cleanup some cruft resulting from the move of the btl's to * | | fd6a044 Cleanup some cruft resulting from the move of the btl's to * | | b44a244 openmpi-release.sh: update for git * | | 5428301 Remove catamount timer support | |/ |/| * | d2bb8d8 remove alps ess component * | d033674 openmpi-nightly-tarball.sh: don't even check v1.6 any more * | 534d773 openmpi-nightly-tarball.sh: fix typo in ompi-release URLs * | 0e21c66 openmpi-nightly-tarball.sh: fix typo * | f72bf3b gkcommit.pl: so long gkcommit; you served us well in SVN day * | a12eef6 find-copyrights.pl: updates for git * | 58e6213 make_dist_tarball: remove debug statement * | 72d1359 create_tarball.sh: update the email to remove SVN references |/ * 8cd3ee7 create_tarball.sh: adjust for new VERSION file format * 697b18d Making async copy the default ----8<---- Best, -Dave
