AST
["",
#<Element:0x802c39ec0
@attr={},
@block=true,
@contents=
[#<Element:0x802c39628
@attr={},
@block=false,
@contents=["GitCheetSheet"],
@innerYATML="GitCheetSheet",
@name="link">],
@innerYATML="GitCheetSheet",
@name="section">,
#<Element:0x802c38e80
@attr={},
@block=true,
@contents=
["\347\267\250\351\233\206\344\270\255\343\201\256\343\203\225\343\202\241\343\202\244\343\203\253\343\202\222\344\270\200\346\231\202\347\232\204\343\201\253\343\201\251\343\201\213\343\201\231",
#<Element:0x802c38020
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" ",
#<Element:0x802c376c0
@attr={},
@block=false,
@contents=
[#<Element:0x802c37530
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" stash",
#<Element:0x802c36e50
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
#<Element:0x802c364f0
@attr={},
@block=false,
@contents=
[#<Element:0x802c36360
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" stash \343\202\222\343\202\202\343\201\250\343\201\253\346\210\273\343\201\231",
#<Element:0x802c35ca8
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" ",
#<Element:0x802c35348
@attr={},
@block=false,
@contents=
[#<Element:0x802c35168
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" stash pop",
#<Element:0x802c34a60
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
#<Element:0x802c340b0
@attr={},
@block=false,
@contents=
[#<Element:0x802c33f20
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" add\343\201\227\343\201\246\343\201\252\343\201\204\343\203\225\343\202\241\343\202\244\343\203\253\343\201\240\343\201\221stash\343\201\231\343\202\213",
#<Element:0x802c33868
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" ",
#<Element:0x802c32f08
@attr={},
@block=false,
@contents=
[#<Element:0x802c32d78
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" stash save --keep-index ",
#<Element:0x802c326c0
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"\343\201\276\343\201\241\343\201\214\343\201\243\343\201\246",
#<Element:0x802c31d60
@attr={},
@block=false,
@contents=
[#<Element:0x802c31bd0
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" commit\343\201\227\343\201\237!",
#<Element:0x802c31518
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" ",
#<Element:0x802c30bb8
@attr={},
@block=false,
@contents=
[#<Element:0x802c30a28
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" reset HEAD^",
#<Element:0x802c30370
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"Subversion\351\226\242\351\200\243",
#<Element:0x802c2f808
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" \343\201\202\343\201\237\343\202\211\343\201\227\343\201\204\343\202\257\343\203\251\343\202\244\343\202\242\343\203\263\343\203\210\343\202\222\344\275\234\343\202\213",
#<Element:0x802c2eca0
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" ",
#<Element:0x802c2e138
@attr={},
@block=false,
@contents=
[#<Element:0x802c2dfa8
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" svn clone --prefix=svn/ -s ",
#<Element:0x802c2e390
@attr={},
@block=false,
@contents=["http://hogehoge"],
@innerYATML="http://hogehoge",
@name="link">,
#<Element:0x802c2d738
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" \346\234\200\346\226\260\347\211\210\343\202\222\345\217\226\343\201\243\343\201\246\343\201\217\343\202\213",
#<Element:0x802c2cbd0
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" ",
#<Element:0x802c2c270
@attr={},
@block=false,
@contents=
[#<Element:0x802c2c0e0
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" svn rebase",
#<Element:0x802c2ba28
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" \343\202\265\343\203\274\343\203\220\343\203\274\343\201\253\351\200\201\343\202\213",
#<Element:0x802c2aec0
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" ",
#<Element:0x802c2a560
@attr={},
@block=false,
@contents=
[#<Element:0x802c2a3d0
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" svn dcommit",
#<Element:0x802c29d18
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
#<Element:0x802c293b8
@attr={},
@block=false,
@contents=
[#<Element:0x802c29228
@attr={},
@block=false,
@contents=["cygwin"],
@innerYATML="cygwin",
@name="link">],
@innerYATML="",
@name="autolink">,
" + ",
#<Element:0x802c28e90
@attr={},
@block=false,
@contents=
[#<Element:0x802c28d00
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" + winmerge \343\202\222\344\275\277\343\201\204\343\201\237\343\201\204\343\200\202",
#<Element:0x802c28530
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" \343\201\223\343\201\256\350\276\272\343\202\222\345\217\202\350\200\203\343\201\253",
#<Element:0x802c279c8
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" ",
#<Element:0x802c270b8
@attr={},
@block=false,
@contents=
["http://stackoverflow.com/questions/1881594/use-winmerge-inside-of-git-to-file-diff"],
@innerYATML=
"http://stackoverflow.com/questions/1881594/use-winmerge-inside-of-git-to-file-diff",
@name="link">,
#<Element:0x802c26ac8
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" ",
#<Element:0x802c260f0
@attr={},
@block=false,
@contents=
["http://blogs.msdn.com/shrib/archive/2009/04/13/gitdiff-bat-power-diffing-with-git.aspx"],
@innerYATML=
"http://blogs.msdn.com/shrib/archive/2009/04/13/gitdiff-bat-power-diffing-with-git.aspx",
@name="link">,
#<Element:0x802c25b50
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
" \346\254\241\343\201\256\343\203\225\343\202\241\343\202\244\343\203\253\343\202\222\344\275\234\343\202\213"],
@innerYATML=
"\347\267\250\351\233\206\344\270\255\343\201\256\343\203\225\343\202\241\343\202\244\343\203\253\343\202\222\344\270\200\346\231\202\347\232\204\343\201\253\343\201\251\343\201\213\343\201\231\n git stash\ngit stash \343\202\222\343\202\202\343\201\250\343\201\253\346\210\273\343\201\231\n git stash pop\ngit add\343\201\227\343\201\246\343\201\252\343\201\204\343\203\225\343\202\241\343\202\244\343\203\253\343\201\240\343\201\221stash\343\201\231\343\202\213\n git stash save --keep-index \n\343\201\276\343\201\241\343\201\214\343\201\243\343\201\246git commit\343\201\227\343\201\237!\n git reset HEAD^\nSubversion\351\226\242\351\200\243\n \343\201\202\343\201\237\343\202\211\343\201\227\343\201\204\343\202\257\343\203\251\343\202\244\343\202\242\343\203\263\343\203\210\343\202\222\344\275\234\343\202\213\n git svn clone --prefix=svn/ -s http://hogehoge\n \346\234\200\346\226\260\347\211\210\343\202\222\345\217\226\343\201\243\343\201\246\343\201\217\343\202\213\n git svn rebase\n \343\202\265\343\203\274\343\203\220\343\203\274\343\201\253\351\200\201\343\202\213\n git svn dcommit\ncygwin + git + winmerge \343\202\222\344\275\277\343\201\204\343\201\237\343\201\204\343\200\202\n \343\201\223\343\201\256\350\276\272\343\202\222\345\217\202\350\200\203\343\201\253\n http://stackoverflow.com/questions/1881594/use-winmerge-inside-of-git-to-file-diff\n http://blogs.msdn.com/shrib/archive/2009/04/13/gitdiff-bat-power-diffing-with-git.aspx\n \346\254\241\343\201\256\343\203\225\343\202\241\343\202\244\343\203\253\343\202\222\344\275\234\343\202\213\n",
@name="list">,
#<Element:0x802c24cf0
@attr={"filename"=>"git-diff"},
@block=true,
@contents=
["rm -rf /tmp/",
#<Element:0x802c24110
@attr={},
@block=false,
@contents=
[#<Element:0x802c23f80
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
"-diff",
#<Element:0x802c238c8
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"mkdir /tmp/",
#<Element:0x802c22f68
@attr={},
@block=false,
@contents=
[#<Element:0x802c22dd8
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
"-diff",
#<Element:0x802c22720
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"mkdir /tmp/",
#<Element:0x802c21dc0
@attr={},
@block=false,
@contents=
[#<Element:0x802c21c30
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
"-diff/old",
#<Element:0x802c21578
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"mkdir /tmp/",
#<Element:0x802c20c18
@attr={},
@block=false,
@contents=
[#<Element:0x802c20a88
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
"-diff/new",
#<Element:0x802c203d0
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
#<Element:0x802c1fd18
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"GIT_EXTERNAL_DIFF=",
#<Element:0x802c1f3b8
@attr={},
@block=false,
@contents=
[#<Element:0x802c1f228
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
"-diff-impl.rb ",
#<Element:0x802c1ee90
@attr={},
@block=false,
@contents=
[#<Element:0x802c1ed00
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
" diff $*",
#<Element:0x802c1e558
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
#<Element:0x802c1dea0
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"/cygdrive/c/Program\\ Files/",
#<Element:0x802c1d0e0
@attr={},
@block=false,
@contents=["WinMerge"],
@innerYATML="WinMerge",
@name="link">,
"/",
#<Element:0x802c1cdc0
@attr={},
@block=false,
@contents=["WinMerge"],
@innerYATML="WinMerge",
@name="link">,
"U.exe -r -e -dl \"base\" -dr \"Mine\" `cygpath -w /tmp/",
#<Element:0x802c1d540
@attr={},
@block=false,
@contents=
[#<Element:0x802c1d3b0
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
"-diff/old` `cygpath -w /tmp/",
#<Element:0x802c1c898
@attr={},
@block=false,
@contents=
[#<Element:0x802c1c708
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
"-diff/new`"],
@innerYATML=
"rm -rf /tmp/git-diff\nmkdir /tmp/git-diff\nmkdir /tmp/git-diff/old\nmkdir /tmp/git-diff/new\n\nGIT_EXTERNAL_DIFF=git-diff-impl.rb git diff $*\n\n/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`\n",
@name="code">,
#<Element:0x802c1bbc8
@attr={"filename"=>"git-diff-impl.rb"},
@block=true,
@contents=
["",
#<Element:0x802c1ac78
@attr={},
@block=false,
@contents=["!/usr/bin/ruby"],
@innerYATML="!/usr/bin/ruby",
@name="sumi">,
#<Element:0x802c1a070
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"require \"ftools\"",
#<Element:0x802c19508
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
#<Element:0x802c18e00
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"path_of_file_in_branch = ARGV[0]",
#<Element:0x802c181f8
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"old_file = ARGV[1]",
#<Element:0x802c17690
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"new_file = ARGV[4]",
#<Element:0x802c16b28
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"old_files_dir = \"/tmp/",
#<Element:0x802c161a0
@attr={},
@block=false,
@contents=
[#<Element:0x802c16010
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
"-diff/old\"",
#<Element:0x802c15958
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"new_files_dir = \"/tmp/",
#<Element:0x802c14ff8
@attr={},
@block=false,
@contents=
[#<Element:0x802c14e68
@attr={},
@block=false,
@contents=["git"],
@innerYATML="git",
@name="link">],
@innerYATML="",
@name="autolink">,
"-diff/new\"",
#<Element:0x802c147b0
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
#<Element:0x802c140f8
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"file_name = File.basename(path_of_file_in_branch)",
#<Element:0x802c13590
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
#<Element:0x802c12ed8
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"File.copy(old_file, old_files_dir + \"\\\\\" + file_name) if old_file != \"/dev/null\"",
#<Element:0x802c12370
@attr={},
@block=false,
@contents=[],
@innerYATML="",
@name="br">,
"File.copy(new_file, new_files_dir + \"\\\\\" + file_name) if new_file != \"/dev/null\""],
@innerYATML=
"#!/usr/bin/ruby\n\nrequire \"ftools\"\n\npath_of_file_in_branch = ARGV[0]\nold_file = ARGV[1]\nnew_file = ARGV[4]\nold_files_dir = \"/tmp/git-diff/old\"\nnew_files_dir = \"/tmp/git-diff/new\"\n\nfile_name = File.basename(path_of_file_in_branch)\n\nFile.copy(old_file, old_files_dir + \"\\\\\" + file_name) if old_file != \"/dev/null\"\nFile.copy(new_file, new_files_dir + \"\\\\\" + file_name) if new_file != \"/dev/null\"\n",
@name="code">]
wabisabi
["",
["h2",
{},
["span",
{"style"=>".notfound"},
"GitCheetSheet",
["a", {"href"=>"/wiki/GitCheetSheet/"}, "?"]]],
["ul",
{},
["li",
{},
"\347\267\250\351\233\206\344\270\255\343\201\256\343\203\225\343\202\241\343\202\244\343\203\253\343\202\222\344\270\200\346\231\202\347\232\204\343\201\253\343\201\251\343\201\213\343\201\231",
["ul",
{},
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" stash"]]],
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" stash \343\202\222\343\202\202\343\201\250\343\201\253\346\210\273\343\201\231",
["ul",
{},
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" stash pop"]]],
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" add\343\201\227\343\201\246\343\201\252\343\201\204\343\203\225\343\202\241\343\202\244\343\203\253\343\201\240\343\201\221stash\343\201\231\343\202\213",
["ul",
{},
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" stash save --keep-index "]]],
["li",
{},
"\343\201\276\343\201\241\343\201\214\343\201\243\343\201\246",
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" commit\343\201\227\343\201\237!",
["ul",
{},
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" reset HEAD^"]]],
["li",
{},
"Subversion\351\226\242\351\200\243",
["ul",
{},
["li",
{},
"\343\201\202\343\201\237\343\202\211\343\201\227\343\201\204\343\202\257\343\203\251\343\202\244\343\202\242\343\203\263\343\203\210\343\202\222\344\275\234\343\202\213",
["ul",
{},
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" svn clone --prefix=svn/ -s ",
["a",
{"href"=>"http://hogehoge", "class"=>"outlink", "rel"=>"nofollow"},
"http://hogehoge"]]]],
["li",
{},
"\346\234\200\346\226\260\347\211\210\343\202\222\345\217\226\343\201\243\343\201\246\343\201\217\343\202\213",
["ul",
{},
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" svn rebase"]]],
["li",
{},
"\343\202\265\343\203\274\343\203\220\343\203\274\343\201\253\351\200\201\343\202\213",
["ul",
{},
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" svn dcommit"]]]]],
["li",
{},
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/cygwin/"}, "cygwin"]],
" + ",
["span", {"class"=>"autolink"}, ["a", {"href"=>"/wiki/git/"}, "git"]],
" + winmerge \343\202\222\344\275\277\343\201\204\343\201\237\343\201\204\343\200\202",
["ul",
{},
["li",
{},
"\343\201\223\343\201\256\350\276\272\343\202\222\345\217\202\350\200\203\343\201\253",
["ul",
{},
["li",
{},
["a",
{"href"=>
"http://stackoverflow.com/questions/1881594/use-winmerge-inside-of-git-to-file-diff",
"class"=>"outlink",
"rel"=>"nofollow"},
"http://stackoverflow.com/questions/1881594/use-winmerge-inside-of-git-to-file-diff"]],
["li",
{},
["a",
{"href"=>
"http://blogs.msdn.com/shrib/archive/2009/04/13/gitdiff-bat-power-diffing-with-git.aspx",
"class"=>"outlink",
"rel"=>"nofollow"},
"http://blogs.msdn.com/shrib/archive/2009/04/13/gitdiff-bat-power-diffing-with-git.aspx"]]]],
["li",
{},
"\346\254\241\343\201\256\343\203\225\343\202\241\343\202\244\343\203\253\343\202\222\344\275\234\343\202\213"]]]],
["div",
{"class"=>"code"},
["div", {"class"=>"filename"}, "git-diff"],
["pre",
{},
"rm -rf /tmp/git-diff\nmkdir /tmp/git-diff\nmkdir /tmp/git-diff/old\nmkdir /tmp/git-diff/new\n\nGIT_EXTERNAL_DIFF=git-diff-impl.rb git diff $*\n\n/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`\n"]],
["div",
{"class"=>"code"},
["div", {"class"=>"filename"}, "git-diff-impl.rb"],
["pre",
{},
"#!/usr/bin/ruby\n\nrequire \"ftools\"\n\npath_of_file_in_branch = ARGV[0]\nold_file = ARGV[1]\nnew_file = ARGV[4]\nold_files_dir = \"/tmp/git-diff/old\"\nnew_files_dir = \"/tmp/git-diff/new\"\n\nfile_name = File.basename(path_of_file_in_branch)\n\nFile.copy(old_file, old_files_dir + \"\\\\\" + file_name) if old_file != \"/dev/null\"\nFile.copy(new_file, new_files_dir + \"\\\\\" + file_name) if new_file != \"/dev/null\"\n"]]]