From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
To: git@vger.kernel.org
Subject: merging branch
Date: Mon, 24 Jan 2011 12:33:02 +0100 [thread overview]
Message-ID: <AANLkTinKt0pi_1NaEJY8-c1B3SKsWdxqEyTvJiGL-vYj@mail.gmail.com> (raw)
Hi,
I have the following branches:
$ git branch
* master
release
I have messed up my 'release' branch by manually importing file one
by one using: git checkout release && git checkout master my_file.cxx
So now I'd like to merge back release to master. I tried:
$ git checkout master && git merge -s ours release
$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 27 commits.
#
nothing to commit (working directory clean)
$ git diff origin/master..master
-> return nothing
Since most of those commits will be redundant, I need to 'git pull
--rebase', right ? However I did not understand how to pass the
--interactive option to git pull --rebase to split this set of 27
commits (I'd like to discard at least one large one)
Thanks !
--
Mathieu
reply other threads:[~2011-01-24 11:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=AANLkTinKt0pi_1NaEJY8-c1B3SKsWdxqEyTvJiGL-vYj@mail.gmail.com \
--to=mathieu.malaterre@gmail.com \
--cc=git@vger.kernel.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
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).