From: Alexey Tourbin <at@altlinux.ru>
To: devel@lists.altlinux.org
Subject: Re: [devel] вопрос по git.
Date: Thu, 19 Oct 2006 17:44:28 +0400
Message-ID: <20061019134428.GZ11317@localhost.localdomain> (raw)
In-Reply-To: <200610181748.32911.thresh@altlinux.ru>
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
On Wed, Oct 18, 2006 at 05:48:32PM +0400, Pavlov Konstantin wrote:
> Всем привет.
>
> Есть у меня бранч upstream, в нем есть vlc.spec от RH/FC/Whatever.
> Есть у меня бранч mybranch, в нем есть vlc.spec от ALT.
>
> Как сделать vlc.spec неизменяемым относительно upstream при git pull .
> upstream в mybranch?
Нужно скопировть upstream spec в свой бранч под другим именем, например
*.spec.orig. При совпадении sha1 изменения по идее дложны будут
накатываться на *.spec.orig. In-index merge это что ли называется
а может быть и нет.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
prev parent reply other threads:[~2006-10-19 13:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-18 13:48 Pavlov Konstantin
2006-10-18 19:27 ` Michael Shigorin
2006-10-18 20:18 ` Денис Смирнов
2006-10-18 20:41 ` Pavlov Konstantin
2006-10-19 5:22 ` Kirill Maslinsky
2006-10-19 13:44 ` Alexey Tourbin [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=20061019134428.GZ11317@localhost.localdomain \
--to=at@altlinux.ru \
--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