From: Vitaly Lipatov <lav@altlinux.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] Польза от diff: v@version@:.
Date: Sun, 08 Nov 2020 19:47:15 +0300
Message-ID: <e07107c0e9bda804268fb1e57fa19e81@altlinux.ru> (raw)
In-Reply-To: <20201108154444.GA1238072@portlab>
Vladimir D. Seleznev писал 8.11.20 18:44:
...
>> > В некоторых проектах ведут патч-ветку, которую ребейзят поверх
>> > релизного
>> > тега перед мёржем.
>> Интересно посмотреть, есть ли примеры?
>
> Простой пример:
>
> http://git.altlinux.org/gears/p/purple-plugin-carbons.git
Там мержится какая-то неизвестная ветка alt/patches.
commit 6a1f31873dd9e382330e6902d3957c57c03c2e5b
Merge: 63c5c3d c06ea43
Author: Vladimir D. Seleznev <vseleznv@altlinux.org>
Date: Thu Dec 5 23:30:48 2019 +0300
Merge branch 'alt/patches'
При этом вносимое изменение таково, что это пример того, в каких случаях
не стоит использовать этот подход с апстримным гитом и diff.
--
С уважением,
Виталий Липатов,
ALT Linux Team
next prev parent reply other threads:[~2020-11-08 16:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-07 22:51 Vitaly Lipatov
2020-11-07 23:20 ` Vladimir D. Seleznev
2020-11-08 1:42 ` Vitaly Lipatov
2020-11-08 15:44 ` Vladimir D. Seleznev
2020-11-08 16:47 ` Vitaly Lipatov [this message]
2020-11-08 17:00 ` Vladimir D. Seleznev
2020-11-08 18:36 ` Vitaly Lipatov
2020-11-08 18:54 ` Vladimir D. Seleznev
2020-11-08 20:44 ` Vitaly Lipatov
2020-11-09 7:53 ` Paul Wolneykien
2020-11-08 10:08 ` Denis Medvedev
2020-11-09 8:12 ` Anton Farygin
2020-11-09 9:05 ` Stanislav Levin
2020-11-09 9:09 ` Anton Farygin
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=e07107c0e9bda804268fb1e57fa19e81@altlinux.ru \
--to=lav@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