X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fuser-manual.txt;h=08d1310bf5fc5590ada1ee5b2af77d361ff4d874;hb=55e839e378416b70720308e86439e2ad6ecccc4a;hp=f4216899427ab2a24f92dd20da9b43c01c9ef11b;hpb=7be73ae94e6dac3d1c41268a13b02ff7203c0631;p=git.git diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index f42168994..08d1310bf 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1890,7 +1890,7 @@ adjustments to give web clients some extra information they need: $ mv proj.git /home/you/public_html/proj.git $ cd proj.git $ git --bare update-server-info -$ chmod a+x hooks/post-update +$ mv hooks/post-update.sample hooks/post-update ------------------------------------------------- (For an explanation of the last two lines, see @@ -2825,8 +2825,8 @@ You can also add a "+" to force the update each time: $ git config remote.example.fetch +master:ref/remotes/example/master ------------------------------------------------- -Don't do this unless you're sure you won't mind "git-fetch" possibly -throwing away commits on mybranch. +Don't do this unless you're sure you won't mind "git fetch" possibly +throwing away commits on 'example/master'. Also note that all of the above configuration can be performed by directly editing the file .git/config instead of using