From: "Alexey I. Froloff" <raorn@immo.ru>
To: ALT Devel discussion list <devel@lists.altlinux.org>
Subject: Re: [devel] Q: git fake merge
Date: Wed, 10 Oct 2007 13:39:56 +0400
Message-ID: <20071010093956.GA2062@hell.fortress> (raw)
In-Reply-To: <20071010001705.GA13211@lks.home>
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
* Konstantin A. Lepikhov <lakostis@> [071010 13:35]:
> Допустим, у меня есть некий бранч, в который я хочу якобы смержить некий
> другой бранч. Что значит "якобы" - чтобы по-факту там не менялись,
> обновилась только история коммитов. Как это можно сделать?
Просто "прицепить" другой бранч?
git pull -s ours . branch
--
Regards,
Sir Raorn.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-10-10 9:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-10 0:17 Konstantin A. Lepikhov
2007-10-10 9:39 ` Alexey I. Froloff [this message]
2007-10-10 10:10 ` Damir Shayhutdinov
2007-10-10 11:17 ` Grigory Batalov
2007-10-10 11:41 ` Ivan Fedorov
2007-10-10 11:53 ` Damir Shayhutdinov
2007-10-10 12:02 ` Damir Shayhutdinov
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=20071010093956.GA2062@hell.fortress \
--to=raorn@immo.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