From: Igor Djordjevic <igor.d.djordjevic@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Nikolay Shustov <nikolay.shustov@gmail.com>
Cc: Stefan Beller <sbeller@google.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: "groups of files" in Git?
Date: Fri, 14 Jul 2017 01:40:31 +0200 [thread overview]
Message-ID: <d91f420b-8737-0c94-5a67-f3cb24c2ba22@gmail.com> (raw)
In-Reply-To: <40292f8e-e8a9-8b7a-112f-ef4b183a6b35@gmail.com>
Eh, yet another one, sorry:
On 14/07/2017 01:32, Igor Djordjevic wrote:
>
> $ git checkout featureA
> $ git commit
> $ git checkout master
> $ git reset --hard HEAD^
> $ git merge <HEAD@{1} parents>
The last line should stress <HEAD@{1} *parent branches*>, as we`re
not merging exact parent commits the previous merge commit was made
of, but updated tips of the branches the previous merge commit was
made of... or something along those lines :)
next prev parent reply other threads:[~2017-07-13 23:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-11 15:45 "groups of files" in Git? Nikolay Shustov
2017-07-11 17:18 ` Stefan Beller
2017-07-11 17:47 ` Nikolay Shustov
2017-07-13 18:22 ` Junio C Hamano
2017-07-13 19:47 ` Nikolay Shustov
2017-07-13 21:20 ` Junio C Hamano
2017-07-13 22:39 ` Igor Djordjevic
2017-07-13 23:32 ` Igor Djordjevic
2017-07-13 23:40 ` Igor Djordjevic [this message]
2017-07-11 17:27 ` Randall S. Becker
2017-07-11 17:27 ` Junio C Hamano
2017-07-11 18:10 ` Nikolay Shustov
2017-07-11 18:19 ` Stefan Beller
2017-07-11 18:30 ` Nikolay Shustov
2017-07-11 17:39 ` Lars Schneider
2017-07-11 17:54 ` Nikolay Shustov
2017-07-11 20:20 ` Lars Schneider
2017-07-13 15:21 ` Nikolay Shustov
2017-07-11 22:46 ` Igor Djordjevic
2017-07-13 15:37 ` Nikolay Shustov
2017-07-13 18:09 ` Junio C Hamano
2017-07-13 19:31 ` Nikolay Shustov
2017-07-11 20:09 ` Fredrik Gustafsson
2017-07-11 22:27 ` astian
2017-07-13 17:04 ` Nikolay Shustov
2017-07-13 23:06 ` Igor Djordjevic
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d91f420b-8737-0c94-5a67-f3cb24c2ba22@gmail.com \
--to=igor.d.djordjevic@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nikolay.shustov@gmail.com \
--cc=sbeller@google.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).