From: Aleksey Avdeev <solo@solin.spb.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] git merge -s ours наоборот
Date: Thu, 12 Feb 2009 11:07:08 +0300
Message-ID: <4993D8AC.5040409@solin.spb.ru> (raw)
In-Reply-To: <4993D6E4.9040802@solin.spb.ru>
[-- Attachment #1: Type: text/plain, Size: 511 bytes --]
Aleksey Avdeev пишет:
> Eugene Prokopiev пишет:
>> Здравствуйте!
>>
>> Существует ли более правильный способ сделать git merge -s ours
>> наоборот (затереть все, что есть в текущем бранче содержимым другого
>> бранча), чем перенос файлов с помощью git archive?
>
> git branche -f ?
Точнее, последовательность из:
1. git branch <бранч> <бранч>.old
2. git branch -f <чем затираем> <бранч>
3. git checkout <бранч>
4. git pull -s ours . <бранч>.old
--
С уважением. Алексей.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 552 bytes --]
next prev parent reply other threads:[~2009-02-12 8:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-12 7:18 Eugene Prokopiev
2009-02-12 7:59 ` Aleksey Avdeev
2009-02-12 8:02 ` Andrey Rahmatullin
2009-02-12 8:07 ` Aleksey Avdeev [this message]
2009-02-12 8:13 ` Eugene Prokopiev
2009-02-12 8:39 ` Aleksey Avdeev
2009-02-12 8:44 ` Eugene Prokopiev
2009-02-12 9:18 ` Aleksey Avdeev
2009-02-14 20:33 ` Alexey Tourbin
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=4993D8AC.5040409@solin.spb.ru \
--to=solo@solin.spb.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