Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > diff --git a/sha1_name.c b/sha1_name.c > > index aa3f3e0..a36852d 100644 > > --- a/sha1_name.c > > +++ b/sha1_name.c > > @@ -415,9 +415,9 @@ static int ambiguous_path(const char *path, int len) > > return slash; > > } > > > > -static inline int upstream_mark(const char *string, int len) > > +static inline int tracking_mark(const char *string, int len) > > { > > - const char *suffix[] = { "upstream", "u" }; > > + const char *suffix[] = { "upstream", "u", "publish", "p" }; > > Oh, another thing: on some threads, people decided that "@{push}" > would be a more apt name (+ alias @{u} to @{pull} for symmetry). @{push} is the name I originally suggested, but it's weird to talk about "the push branch", so I decided on "the publish branch", which is more natural. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html