{"thread":{"id":"26325","subject":"merging branch","startedAt":"2011-01-24T11:33:02Z","lastAt":"2011-01-24T11:33:02Z","messageCount":1,"participants":["Mathieu Malaterre"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"159821","messageId":"AANLkTinKt0pi_1NaEJY8-c1B3SKsWdxqEyTvJiGL-vYj@mail.gmail.com","threadId":"26325","inReplyTo":null,"subject":"merging branch","fromName":"Mathieu Malaterre","fromEmail":"mathieu.malaterre@gmail.com","sentAt":"2011-01-24T11:33:02Z","receivedAt":"2011-01-24T11:33:02Z","isPatch":false,"sender":{"key":"mathieu.malaterre@gmail.com","avatar":"https://gravatar.com/avatar/0728db14da3b5f9cb00476f504394196a14dac116214d8114f402fad0871bb86?d=mp&s=160"},"body":"Hi,\n\n  I have the following branches:\n\n$ git branch\n* master\n  release\n\n  I have messed up my 'release' branch by manually importing file one\nby one using: git checkout release && git checkout master my_file.cxx\n\n  So now I'd like to merge back release to master. I tried:\n\n$ git checkout master && git merge -s ours release\n$ git status\n# On branch master\n# Your branch is ahead of 'origin/master' by 27 commits.\n#\nnothing to commit (working directory clean)\n$ git diff origin/master..master\n-> return nothing\n\nSince most of those commits will be redundant, I need to 'git pull\n--rebase', right ? However I did not understand how to pass the\n--interactive option to git pull --rebase to split this set of 27\ncommits (I'd like to discard at least one large one)\n\nThanks !\n-- \nMathieu\n"}]}