git.rst
changeset 836 64ecb45d68fa
parent 835 d0bddeaf586b
child 899 7b4265c8d324
equal deleted inserted replaced
835:d0bddeaf586b 836:64ecb45d68fa
    41 
    41 
    42 Only http:// protocol support proxy (not git://).
    42 Only http:// protocol support proxy (not git://).
    43 
    43 
    44   $ export http_proxy="http://username:password@proxy:port/"
    44   $ export http_proxy="http://username:password@proxy:port/"
    45   $ git clone http://github.com/$user/$proj.git $proj
    45   $ git clone http://github.com/$user/$proj.git $proj
       
    46 
       
    47 You can store proxy settings under repository local config file:
       
    48 
       
    49   $ git config http.proxy http://$user:$passwd@$ip:$port
    46 
    50 
    47 * Start your project.
    51 * Start your project.
    48 
    52 
    49 Setup proj space on fs.
    53 Setup proj space on fs.
    50 
    54 
   148 
   152 
   149 By previous commands you grab changes from remote server! You can apply them:
   153 By previous commands you grab changes from remote server! You can apply them:
   150 
   154 
   151   TODO
   155   TODO
   152   $ git merge
   156   $ git merge
       
   157 
       
   158 * git analog of 'hg outgoing'.
       
   159 
       
   160 git does not directly support such feature. You can emulate it by:
       
   161 
       
   162   $ git fetch
       
   163   $ git log origin/master..master   # or just 'origin/master..'
   153 
   164 
   154 * Debug git network operation.
   165 * Debug git network operation.
   155 
   166 
   156 Git uses libcurl for network operation.
   167 Git uses libcurl for network operation.
   157 
   168