From: Vitaly Ostanin <vyt@altlinux.org>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] gear: build from branch
Date: Thu, 23 Oct 2008 22:11:08 +0400
Message-ID: <4900BE3C.1090206@altlinux.org> (raw)
In-Reply-To: <20081023175213.GE21185@altlinux.org>
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
Alexey I. Froloff пишет:
> * Vitaly Ostanin <vyt@> [081023 21:45]:
>> gear-update-tag -a
>> делал.
> И что он сказал? А если -v добавить?
Сказал, что tag upstream unchanged, я сделал git-commit, и сборка
пошла. У меня тут какая-то локальная путаница.
>> читал, не помогло. Например, git-merge -s ours . upstream не
>> работает:
>> . - not something we can merge
> merge != pull, ему не надо указывать ремоту, он мержит в HEAD.
Я ориентировался на это письмо:
http://lists.altlinux.org/pipermail/devel/2008-April/072689.html
--
Regards, Vyt
mailto: vyt@altlinux.org
JID: vitaly.ostanin@gmail.com
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]
next prev parent reply other threads:[~2008-10-23 18:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-23 17:38 Vitaly Ostanin
2008-10-23 17:52 ` Alexey I. Froloff
2008-10-23 18:11 ` Vitaly Ostanin [this message]
2008-10-23 18:51 ` Alexey I. Froloff
2008-10-24 11:12 ` Vitaly Ostanin
2008-10-24 11:17 ` Damir Shayhutdinov
2008-10-24 11:25 ` Vitaly Ostanin
2008-10-24 11:30 ` Damir Shayhutdinov
2008-10-24 13:58 ` Sergey Vlasov
2008-10-26 21:44 ` Aleksey Avdeev
2008-10-26 23:04 ` Vitaly Ostanin
2008-10-27 7:32 ` Grigory Batalov
2008-10-23 18:26 ` Vitaly Ostanin
2008-10-23 18:36 ` Dmitry V. Levin
2008-10-23 18:51 ` Led
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=4900BE3C.1090206@altlinux.org \
--to=vyt@altlinux.org \
--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