merging branch

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 !