Skip to content

Instantly share code, notes, and snippets.

@DeadSix27

DeadSix27/gist:0d4af2c2a2bb89a837f37a2985aaa8d4

Created November 24, 2017 17:00
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save DeadSix27/0d4af2c2a2bb89a837f37a2985aaa8d4 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save DeadSix27/0d4af2c2a2bb89a837f37a2985aaa8d4 to your computer and use it in GitHub Desktop.
Download ZIP
rebasing a patch
Raw
gistfile1.txt
Example on ffmpeg:
git clone https://github.com/FFmpeg/FFmpeg
cd FFmpeg
git remote add -f mpvBranch https://github.com/mpv-player/ffmpeg-mpv
git remote update
wget https://github.com/FFmpeg/FFmpeg/commit/94e5432e6124192fb81893fc5fd40e26f3e09df4.patch
git am -3 94e5432e6124192fb81893fc5fd40e26f3e09df4.patch
echo Resolve the patch manually
exit 1
git add (file)
rm 94e5432e6124192fb81893fc5fd40e26f3e09df4.patch
git commit
git format-patch -n HEAD^
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment