Monthly Archives: October 2017

Import a merge commit from on branch to another branch

git diff the-commit-before-your-commit your-commit > abc.diff git apply –reject –whitespace=fix abc.diff #If you not lucky, you will see some *.rej files generated, which mean failed patchings #You can still a tool to called “wiggle” deal with them wget http://neil.brown.name/wiggle/wiggle-1.1.tar.gz tar xvf wiggle-1.1.tar.gz # You may have to install ncurses library first sudo yum search ncurses […]