On 03/12/13 21:34, Ben Boeckel wrote: > On Mon, Nov 18, 2013 at 12:19:55 +0100, Daniele E. Domenichelli wrote: >> If there are local changes, "git stash" is used to save the >> changes and restore them after the pull. If any of these operation >> fails, it tries to restore the original status and exits with a fatal >> error, asking the user to resolve the conflicts manually. > > I like the `--all` usage, but I see that `--index` is passed to `stash > pop`, but `--keep-index` isn't passed to `stash save`. Is this intended?
git stash save automatically saves the index, that is restored using git stash pop --index. The --keep-index does not save the index but instead keeps it in the working tree. This means that after stashing you will still have a dirty working tree, and therefore rebase will fail. Cheers, Daniele -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
