From: Daniel <mjucde@o2.pl>
To: git@vger.kernel.org, "Łukasz Stelmach" <lukasz.stelmach@iem.pw.edu.pl>
Subject: Re: merging unmanaged working tree
Date: Mon, 15 Mar 2010 13:34:52 +0100 [thread overview]
Message-ID: <46a29168.6d880e7c.4b9e296c.483a1@o2.pl> (raw)
In-Reply-To: <87ljdtkedl.fsf@dasa3.iem.pw.edu.pl>
> Hello.
>
> Is there a method to (dry?) run git-merge to detect conflicts
> on:
>
> * current HEAD (or working tree)
> * selected previous revision (the one used to "branch")
> * directory tree (or a single file) "branched" with git-archive
>
> I'd like to synchronize portable working tree but don't want to keep
> history in it.
>
> --
> Miłego dnia,
> Łukasz Stelmach
> --
Does "git-merge --squash" do what you want? You still need to have
the other tree managed by git (even for a while).
--
Daniel
next prev parent reply other threads:[~2010-03-15 12:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-15 11:34 merging unmanaged working tree Łukasz Stelmach
2010-03-15 12:34 ` Daniel [this message]
2010-03-15 15:19 ` Łukasz Stelmach
2010-03-15 19:22 ` Avery Pennarun
2010-03-15 23:30 ` Łukasz Stelmach
2010-03-15 23:49 ` Avery Pennarun
2010-03-15 19:58 ` Chris Packham
2010-03-15 20:01 ` Avery Pennarun
2010-03-15 23:28 ` Łukasz Stelmach
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=46a29168.6d880e7c.4b9e296c.483a1@o2.pl \
--to=mjucde@o2.pl \
--cc=git@vger.kernel.org \
--cc=lukasz.stelmach@iem.pw.edu.pl \
/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.
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 NNTP newsgroup(s).