X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=ab4de103586e8382801dad7de2f43c57f4758e7e;hb=4dd4a09eac9ecb27f051ad0f3447c205c5b50c8b;hp=31f42ea21a249abfa1ab2e220a077fee30d3d5e4;hpb=9e2b8857413127ae200735fa004bd445b2c8ca61;p=git.git diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 31f42ea21..ab4de1035 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -31,6 +31,16 @@ in a state that is hard to back out of in the case of a conflict. OPTIONS ------- +-q:: +--quiet:: + This is passed to both underlying git-fetch to squelch reporting of + during transfer, and underlying git-merge to squelch output during + merging. + +-v:: +--verbose:: + Pass --verbose to git-fetch and git-merge. + Options related to merging ~~~~~~~~~~~~~~~~~~~~~~~~~~