git clone git@github.com:YOUR-USERNAME/YOUR-FORKED-REPO.git
cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream
With git log check which commit is one prior the merge. Then you can reset it using: | |
git reset --hard commit_sha | |
There's also another way | |
git reset --hard HEAD~1 | |
will get you back 1 commit. | |
Be aware that any modified and uncommitted/unstashed files will be reset to their unmodified state. | |
To keep them either stash changes away or see --merge option below. |
jar xf myfile.jar |
<!DOCTYPE html> | |
<html> | |
<head> | |
<title>Remove rubberband scrolling from web apps on mobile safari and standalone (iOS)</title> | |
<meta name="apple-mobile-web-app-capable" content="yes"> | |
<meta name="apple-touch-fullscreen" content="yes"> | |
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"> | |
<style> | |
html, body {margin: 0; padding: 0; width:100%; height:100%; overflow: hidden; background: #333} | |
p.center { |
# only if you do not add the original repository as upstream | |
git remote add upstream https://github.com/original_github_username/original_github_repo_name.git | |
# then fetch and create a new branch for your pr | |
git fetch --all | |
git checkout -b new-branch-name-for-pr upstream/master | |
# pick the commits you want to include in your pr | |
git cherry-pick a52afa1 | |
git cherry-pick 08f39f7 |
# if you want to pick some commits from <some-branch> to master for example, | |
# switch to master | |
git checkout master | |
# pick the commits you want to apply to master | |
git cherry-pick a52afa1 | |
git cherry-pick 08f39f7 | |
# if there is a conflict, resolve and commit |