Thread (15 messages) 15 messages, 8 authors, 2016-06-15

Re: [PATCH] modernize fetch/merge/pull examples

From: Thomas Rast <hidden>
Date: 2016-06-15 22:47:36

Clemens Buchacher wrote:
On Tue, Oct 20, 2009 at 11:22:16PM -0700, Junio C Hamano wrote:
quoted
For example, I am in favor of deprecating the "pull $there $src:$dst"
notation. 
A first step in that direction.
I think this is a good change independently of the deprecation.
quoted hunk ↗ jump to hunk
+------------------------------------------------
+$ git fetch origin +pu:pu maint:tmp
+------------------------------------------------
[...]
+The `pu` branch will be updated even if it is does not fast-forward;
+the others will not be.
I think to a new user it is not immediately clear if this means "will
not be updated, period" or "will not be updated if ...".  How about

  The `pu` branch will always be updated; the `tmp` branch only if it
  is a fast-forward update.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help