Skip to content

Instantly share code, notes, and snippets.

@jpzhu

jpzhu/git-am.md

Created May 7, 2014 02:30
Show Gist options
  • Save jpzhu/05e73b83e459cfff4e4c to your computer and use it in GitHub Desktop.
Save jpzhu/05e73b83e459cfff4e4c to your computer and use it in GitHub Desktop.
Download ZIP
git am window EOL
Raw
git-am.md

windows编辑的程序闹死人啊~

$ git format-patch HEAD^
$ git reset --hard HEAD^
$ git am 0001*patch
这样做出来的补丁居然，居然就打不上去了...... 因为原来的文件是windows格式，新文件是*nix格式。

还好，大杀器 git am --ignore-space-change 可以搞定。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment