From: Sergey Afonin <asy@altlinux.ru>
To: devel@lists.altlinux.org
Subject: [devel] git merge, поменять стратегию после внесения нескольких коммитов
Date: Thu, 2 Apr 2015 17:30:07 +0400
Message-ID: <201504021730.07517.asy@altlinux.ru> (raw)
Приветствую.
Можно как-то поменять стратегию git merge ? То есть, например,
ошибочно было выполнено -s ours вместо -s recursive, потом
сделано несколько коммитов. Плохо то, что уже сделан git push
и пакет собран.
--
С уважением, Сергей Афонин.
next reply other threads:[~2015-04-02 13:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 13:30 Sergey Afonin [this message]
2015-04-02 18:18 ` Paul Wolneykien
2015-04-02 18:54 ` Sergey Y. Afonin
2015-04-02 19:15 ` Paul Wolneykien
2015-04-02 19:42 ` Sergey Y. Afonin
2015-04-03 15:21 ` Sergey Y. Afonin
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=201504021730.07517.asy@altlinux.ru \
--to=asy@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