[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: pull request

On Sat, 16 Oct 2010, Peter Palfrader wrote:
> > you simply merge them first and then tune them up so I would avoid
> > resolving conflicts in future merges. 
> Tags aren't fetched by default anyway, are they?
they are fetched by default, UNLESS they are not pointing to treeish
which is reachable downstream from any of the branches (then you have to
fetch -t).  I call this a viral nature of tags in GIT.

> > $> git log --pretty=oneline origin/master..                 
> > c4283801b227af5395b591a1fd005a7df3c5bbef use config's snapshot.domain in page.mako
> > a994ce51cc8d7eb0b0173884be40eb38347950eb use config's snapshot.masterdomain in routes and in the root page
> > >...<
> All merged.

=------------------------------   /v\  ----------------------------=
Keep in touch                    // \\     (yoh@|www.)onerussian.com
Yaroslav Halchenko              /(   )\               ICQ#: 60653192
                   Linux User    ^^-^^    [175555]

Reply to: