Re: [PATCH v3 0/9] User manual updates

2013-02-19 Thread W. Trevor King
On Mon, Feb 18, 2013 at 07:27:50AM -0500, W. Trevor King wrote:
 On Mon, Feb 18, 2013 at 12:56:07AM -0800, Junio C Hamano wrote:
  I've taken the following to 'maint'…
 
 Should I rebase v4 onto maint so I don't accidentally collide with any
 of the previous patches which have already been merged there?

I tried this, but the backtick patch shouldn't move to maint due to:

On Sun, Feb 10, 2013 at 05:36:32PM -0500, W. Trevor King wrote:
 I based my changes on `master` to avoid colliding with 2de9b711
 (Documentation: the name of the system is 'Git', not 'git',
 2013-01-21), but if you shifted them already I suppose you've fixed
 any conflicts ;).

I'll drop it for now, and revive it after the next release syncs
master and maint.  I've rebased the remaining patches onto `maint`.

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy


signature.asc
Description: OpenPGP digital signature


Re: [PATCH v3 0/9] User manual updates

2013-02-18 Thread Junio C Hamano
I've taken the following to 'maint', some with minor and obvious
fix-ups:

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

I think I've sent reviews for all others, except for the `backtick`
one.  I think it is more efficient to do that one _after_ we are
done with all the others.

Thanks.
--
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 0/9] User manual updates

2013-02-18 Thread W. Trevor King
On Mon, Feb 18, 2013 at 12:56:07AM -0800, Junio C Hamano wrote:
 I've taken the following to 'maint'…

Should I rebase v4 onto maint so I don't accidentally collide with any
of the previous patches which have already been merged there?  It
doesn't look like you've pushed the last round of maint additions to
your public repository yet…

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy


signature.asc
Description: OpenPGP digital signature