On 04/01/2015 07:37 PM, James Bigler wrote:
> I have a topic that I pushed to stage, so someone else could take a look.
> At this point, it needed some fixing, so I made some changes to my local
> topic and pushed those back to the same topic. When I push the topic
> into next and the testing passes, what checkin string will be used for
> change list summary purposes?
You can always do
git fetch origin
git log origin/next..mytopic
git log origin/master..mytopic
to see what commits are not yet merged to either branch. They will be
referenced in the merge commit message if you ask the stage to merge
for you. If you never merged the topic to 'next' then you are free
to force-push rewrites before merging. If part has already been merged
to 'next' (which AFAICS is not the case here) then you can merge the
fixup commits to 'next'.
Typically I will revise topics before they are merged to 'master' in
order to squash in fixup commits. If you are really comfortable with
how Git handles merging then you can also rewrite topics that have
already been merged to 'next', force-push, and merge again so long as
the rewritten topic head content is identical to what was already
merged (just with a cleaned up history leading to the same net change).
-Brad
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
