From: Jacob Keller <jacob.keller@gmail.com>
To: "David J. Bakeman" <nakuru@comcast.net>
Cc: "Jakub Narębski" <jnareb@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Git mailing list" <git@vger.kernel.org>
Subject: Re: merge maintaining history
Date: Wed, 25 Jan 2017 16:41:37 -0800 [thread overview]
Message-ID: <CA+P7+xrU-ZO981fKCogm3s1gkz6X-8+fcTS4TG0B=_gqAEwNxQ@mail.gmail.com> (raw)
In-Reply-To: <5889436A.8000707@comcast.net>
On Wed, Jan 25, 2017 at 4:31 PM, David J. Bakeman <nakuru@comcast.net> wrote:
> OK so what I've done so far is to clone the original then I added
> another remote connected to new repo. Then I did git merge newrepo. It
> did a bunch of stuff that flashed by really fast and then reported a
> conflict. Now if I do a git st there are a bunch of files that seem to
> be already added to a commit and all the files with conflicts which it's
> says need to be fixed and added.
> I'm still learning git even after using it for several years. I've
> never really seen this before. So the already added files are the ones
> that git was able to merge mechanically? If so can I diff those changes
> some way? Would I have to un add (reset HEAD) all those files to see
> the diffs? Would it have assumed that my changes are to be preferred?
>
> Thanks again for all the great help!
Try "git diff --cached" to show all the current differences saved in the index.
Thanks,
Jake
next prev parent reply other threads:[~2017-01-26 0:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-14 2:01 merge maintaining history David J. Bakeman
2017-01-15 6:24 ` Jacob Keller
2017-01-19 13:12 ` David J. Bakeman
2017-01-19 21:42 ` Junio C Hamano
2017-01-20 11:37 ` Jakub Narębski
2017-01-20 17:33 ` Junio C Hamano
2017-01-26 0:31 ` David J. Bakeman
2017-01-26 0:41 ` Jacob Keller [this message]
2017-01-19 21:58 ` Philip Oakley
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='CA+P7+xrU-ZO981fKCogm3s1gkz6X-8+fcTS4TG0B=_gqAEwNxQ@mail.gmail.com' \
--to=jacob.keller@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=nakuru@comcast.net \
/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).