Domen Vrankar wrote: > Usually what I do in such cases is > - commit each patch separately to git > - when I have to change one of them I just save commit messages, call > "git format-patch -5 HEAD" where 5 is the amount of commits to the one > that I wish to change > - use "git reset --soft HEAD^" to undo commits > - "git checkout *" to undo the changes > - change the patch > - commit once again > - reapply other patches with "git apply --reject <path_to_patch>" (if > needed search for rej files and apply parts manually)
I recommend git rebase: https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase-i Thanks, Steve. -- 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
