On Sun, 17 Mar 2019 at 13:49, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote: > > I added this option in git-checkout and git-merge in c1d7036b6b > (checkout,merge: disallow overwriting ignored files with > --no-overwrite-ignore - 2011-11-27) but did not remember to update > documentation. This completes that commit. > +--overwrite-ignore:: > +--no-overwrite-ignore:: > + Silently overwrite ignored files when switching branches. This > + is the default behavior. Use `--no-overwrite-ignore` to abort > + the operation when the new branch contains ignored files. > + > --recurse-submodules:: > --no-recurse-submodules:: > - Using --recurse-submodules will update the content of all initialized > + Using `--recurse-submodules` will update the content of all initialized > submodules according to the commit recorded in the superproject. If > local modifications in a submodule would be overwritten the checkout > - will fail unless `-f` is used. If nothing (or --no-recurse-submodules) > + will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) > is used, the work trees of submodules will not be updated. > - Just like linkgit:git-submodule[1], this will detach the > - submodules HEAD. > + Just like linkgit:git-submodule[1], this will detach `HEAD` of the > + submodule. All of this `--recurse-submodules` stuff seems to have have ended up in the wrong commit. Martin
