Re: [PATCH v3 1/9] user-manual: Use 'remote add' to setup push URLs

2013-02-17 Thread Junio C Hamano
W. Trevor King wk...@tremily.us writes:

 From: W. Trevor King wk...@tremily.us

 There is no need to use here documents to setup this configuration.
 It is easier, less confusing, and more robust to use `git remote add`
 directly.

 Signed-off-by: W. Trevor King wk...@tremily.us
 ---

This looks like a good 'maint' material that can be applied straight
away there in preparation for 1.8.1.4 to me; reviewers watching from
the sideline, please stop me if you see issues.

  Documentation/user-manual.txt | 15 ++-
  1 file changed, 10 insertions(+), 5 deletions(-)

 diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
 index 5077e7c..a060eb6 100644
 --- a/Documentation/user-manual.txt
 +++ b/Documentation/user-manual.txt
 @@ -1998,16 +1998,21 @@ 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!
  
  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

As the additional remote.public-repo.fetch line hints, this does
more than lets you do the same push with just [lazily]; it also
starts pretending to have run a fetch from there immediately after
you pushed and update the remote tracking branches.  I couldn't
decide if it is a good idea to point it out in this point of the
flow as well, or it is too much detail that is not exactly relevant
while teaching git push.  I tend to think it would be the latter.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v3 1/9] user-manual: Use 'remote add' to setup push URLs

2013-02-17 Thread Jonathan Nieder
Junio C Hamano wrote:
 W. Trevor King wk...@tremily.us writes:

 There is no need to use here documents to setup this configuration.
 It is easier, less confusing, and more robust to use `git remote add`
 directly.
[...]
 This looks like a good 'maint' material that can be applied straight
 away there in preparation for 1.8.1.4 to me; reviewers watching from
 the sideline, please stop me if you see issues.

Agreed --- this looks good.

[...]
 As the additional remote.public-repo.fetch line hints, this does
 more than lets you do the same push with just [lazily]; it also
 starts pretending to have run a fetch from there immediately after
 you pushed and update the remote tracking branches.  I couldn't
 decide if it is a good idea to point it out in this point of the
 flow as well, or it is too much detail that is not exactly relevant
 while teaching git push.  I tend to think it would be the latter.

I think it's possible to improve the text here to hint that there's
more to learn (maybe a forward-reference to a section about the
remotes/* hierarchy) without getting lost in the details.  But that
problem was already there, and I don't think it should block this
improvement.

Thanks.
Jonathan
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html