From: Led <ledest@gmail.com>
To: devel@lists.altlinux.org
Subject: Re: [devel] gear-rules and submodules
Date: Mon, 8 Dec 2008 13:26:38 +0200
Message-ID: <200812081326.38999.ledest@gmail.com> (raw)
In-Reply-To: <20081208102834.GY30445@newmaster.mivlgu.local>
On Monday, 08 December 2008 12:28:34 Sergey Vlasov wrote:
> On Mon, Dec 08, 2008 at 10:49:13AM +0200, Led wrote:
> [...]
>
> > > > > -s subtree.
> > > >
> > > > Например? Как указать каталог, в который нужно мерджить?
> > >
> > > http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtr
> > >ee.h tml
> >
> > Спасибо! Но, как вижу, без read-tree всё же не обойтись - это я как раз
> > нашёл:)
> > А про заключительный "git pull -s subtree" не знал. Сейчас попробую.
> >
> > P.S. А merge всё таки с "-s ours", а не "-s subtree":)
>
> Первый раз делается merge --no-commit -s ours, потом фокусы с read-tree.
> При последующих обновлениях достаточно git merge -s subtree.
Вроде целостная картина складывается... Спасибо!
--
Led
prev parent reply other threads:[~2008-12-08 11:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-07 16:06 Led
2008-12-07 16:49 ` Sergey Vlasov
2008-12-07 17:03 ` Led
2008-12-07 17:58 ` Kirill A. Shutemov
2008-12-08 1:12 ` Led
2008-12-08 6:19 ` Kirill A. Shutemov
2008-12-08 8:49 ` Led
2008-12-08 10:28 ` Sergey Vlasov
2008-12-08 11:26 ` Led [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200812081326.38999.ledest@gmail.com \
--to=ledest@gmail.com \
--cc=devel@lists.altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git