*GitCheetSheet <@list> 編集中のファイルを一時的にどかす git stash git stash をもとに戻す git stash pop git addしてないファイルだけstashする git stash save --keep-index まちがってgit commitした! git reset HEAD^ Subversion関連 あたらしいクライアントを作る git svn clone --prefix=svn/ -s http://hogehoge 最新版を取ってくる git svn rebase サーバーに送る git svn dcommit cygwin + git + winmerge を使いたい。 この辺を参考に http://stackoverflow.com/questions/1881594/use-winmerge-inside-of-git-to-file-diff http://blogs.msdn.com/shrib/archive/2009/04/13/gitdiff-bat-power-diffing-with-git.aspx 次のファイルを作る </@list> <@code filename="git-diff"> rm -rf /tmp/git-diff mkdir /tmp/git-diff mkdir /tmp/git-diff/old mkdir /tmp/git-diff/new GIT_EXTERNAL_DIFF=git-diff-impl.rb git diff $* /cygdrive/c/Program\ Files/WinMerge/WinMergeU.exe -r -e -dl "base" -dr "Mine" `cygpath -w /tmp/git-diff/old` `cygpath -w /tmp/git-diff/new` </@code> <@code filename="git-diff-impl.rb"> #!/usr/bin/ruby require "ftools" path_of_file_in_branch = ARGV[0] old_file = ARGV[1] new_file = ARGV[4] old_files_dir = "/tmp/git-diff/old" new_files_dir = "/tmp/git-diff/new" file_name = File.basename(path_of_file_in_branch) File.copy(old_file, old_files_dir + "\\" + file_name) if old_file != "/dev/null" File.copy(new_file, new_files_dir + "\\" + file_name) if new_file != "/dev/null" git-diff rm -rf /tmp/git-diff mkdir /tmp/git-diff mkdir /tmp/git-diff/old mkdir /tmp/git-diff/new GIT_EXTERNAL_DIFF=git-diff-impl.rb git diff $* /cygdrive/c/Program\ Files/WinMerge/WinMergeU.exe -r -e -dl "base" -dr "Mine" `cygpath -w /tmp/git-diff/old` `cygpath -w /tmp/git-diff/new` git-diff-impl.rb #!/usr/bin/ruby require "ftools" path_of_file_in_branch = ARGV[0] old_file = ARGV[1] new_file = ARGV[4] old_files_dir = "/tmp/git-diff/old" new_files_dir = "/tmp/git-diff/new" file_name = File.basename(path_of_file_in_branch) File.copy(old_file, old_files_dir + "\\" + file_name) if old_file != "/dev/null" File.copy(new_file, new_files_dir + "\\" + file_name) if new_file != "/dev/null"