From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Feb 2013 08:50:33 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4cb8a83bb852010de8dc0887a54204a581536866;p=git.git

Merge branch 'maint'

* maint:
  user-manual: use -o latest.tar.gz to create a gzipped tarball
  user-manual: use 'git config --global user.*' for setup
  user-manual: mention 'git remote add' for remote branch config
  user-manual: give 'git push -f' as an alternative to +master
  user-manual: use 'remote add' to setup push URLs
---

4cb8a83bb852010de8dc0887a54204a581536866
diff --cc Documentation/user-manual.txt
index a4778d725,52c8523c7..23689b0b9
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@@ -988,12 -997,19 +997,19 @@@ Developing with Gi
  ===================
  
  [[telling-git-your-name]]
 -Telling git your name
 +Telling Git your name
  ---------------------
  
- Before creating any commits, you should introduce yourself to Git.  The
- easiest way to do so is to make sure the following lines appear in a
- file named .gitconfig in your home directory:
+ Before creating any commits, you should introduce yourself to Git.
+ The easiest way to do so is to use linkgit:git-config[1]:
+ 
+ ------------------------------------------------
+ $ git config --global user.name 'Your Name Comes Here'
+ $ git config --global user.email 'you@yourdomain.example.com'
+ ------------------------------------------------
+ 
+ Which will add the following to a file named `.gitconfig` in your
+ home directory:
  
  ------------------------------------------------
  [user]
@@@ -1987,22 -2004,26 +2004,27 @@@ handling this case
  
  Note that the target of a "push" is normally a
  <<def_bare_repository,bare>> repository.  You can also push to a
 -repository that has a checked-out working tree, but the working tree
 -will not be updated by the push.  This may lead to unexpected results if
 -the branch you push to is the currently checked-out branch!
 +repository that has a checked-out working tree, but a push to update the
 +currently checked-out branch is denied by default to prevent confusion.
 +See the description ofthe receive.denyCurrentBranch option
 +in linkgit:git-config[1] for details.
  
  As with `git fetch`, you may also set up configuration options to
- save typing; so, for example, after
+ save typing; so, for example:
+ 
+ -------------------------------------------------
+ $ git remote add public-repo ssh://yourserver.com/~you/proj.git
+ -------------------------------------------------
+ 
+ adds the following to `.git/config`:
  
  -------------------------------------------------
- $ cat >>.git/config <<EOF
  [remote "public-repo"]
- 	url = ssh://yourserver.com/~you/proj.git
- EOF
+ 	url = yourserver.com:proj.git
+ 	fetch = +refs/heads/*:refs/remotes/example/*
  -------------------------------------------------
  
- you should be able to perform the above push with just
+ which lets you do the same push with just
  
  -------------------------------------------------
  $ git push public-repo master