* merging branch
@ 2011-01-24 11:33 Mathieu Malaterre
0 siblings, 0 replies; only message in thread
From: Mathieu Malaterre @ 2011-01-24 11:33 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-24 11:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-24 11:33 merging branch Mathieu Malaterre
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).