git.mm

<map version="1.0.1">
<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
<node CREATED="1345617188848" ID="ID_788686702" MODIFIED="1345639697832" TEXT="git">
<node CREATED="1388393170736" ID="ID_1036060750" MODIFIED="1398389027239" POSITION="right" TEXT="perspective">
<node CREATED="1388392653545" ID="ID_950499025" MODIFIED="1388393191920" TEXT="filesystem, snapshot, powerful tools built on fs"/>
<node CREATED="1388392796690" ID="ID_558417163" MODIFIED="1388393191919" TEXT="fully mirror repository, local operation, offline operation"/>
<node CREATED="1388392950351" ID="ID_199115191" MODIFIED="1388393191918" TEXT="integrity, checksumed by SHA-1, referenced(store,access)by SHA-1 checksum"/>
<node CREATED="1388393142326" ID="ID_1359958614" MODIFIED="1388393191918" TEXT="add data, undoable"/>
</node>
<node CREATED="1345621357140" FOLDED="true" ID="ID_1952612481" MODIFIED="1462426341177" POSITION="right" TEXT="config">
<node CREATED="1365435024480" ID="ID_554223747" MODIFIED="1397010831316" TEXT="SSH no passphrase">
<node CREATED="1365435088097" ID="ID_484100334" MODIFIED="1365435102549" TEXT="$ cd ~./ssh"/>
<node CREATED="1365435039257" ID="ID_323080386" MODIFIED="1365435108536" TEXT="$ ssh-keygen -t rsa -C &quot;your_email@example.com&quot;"/>
<node CREATED="1365435959360" ID="ID_859868585" MODIFIED="1365435974057" TEXT="$ ssh -T git@github.com"/>
</node>
<node CREATED="1388395915665" ID="ID_923350521" MODIFIED="1388423727372" TEXT="git config --{,system, global} name value">
<node CREATED="1388396227515" ID="ID_687555641" MODIFIED="1398354876524" TEXT="--{,system,gloabl}">
<node CREATED="1388396133314" ID="ID_714629624" MODIFIED="1388396562609" TEXT="--system[system-wide]: /etc/gitconfig"/>
<node CREATED="1388396180172" ID="ID_1439605859" MODIFIED="1388396572756" TEXT="--global[user-specific]: ~/.gitconfig"/>
<node CREATED="1388396188137" ID="ID_445792622" MODIFIED="1388396592372" TEXT="(default)[project-specific]: .git/config"/>
</node>
<node CREATED="1388396280363" ID="ID_440501772" MODIFIED="1388396389328" TEXT="git config --global user.name &quot;satanson&quot;"/>
<node CREATED="1388396389894" ID="ID_1612443661" MODIFIED="1388396404906" TEXT="git config --global user.email &quot;ranpanf@gmail.com&quot;"/>
</node>
<node CREATED="1388423717771" ID="ID_1157458825" MODIFIED="1388423743505" TEXT="aliases">
<node CREATED="1388423753324" ID="ID_1269354595" MODIFIED="1388423803420" TEXT="git config --global alias.unstage &apos;git reset HEAD&apos;"/>
<node CREATED="1388423804194" ID="ID_944406627" MODIFIED="1388423838309" TEXT="git config --global alias.last &apos;git log -1&apos;"/>
<node CREATED="1388423841143" ID="ID_916471872" MODIFIED="1388423906336" TEXT="git config --gloabl alias.untrack &apos;git rm&apos;"/>
</node>
</node>
<node CREATED="1388428759958" ID="ID_434370742" MODIFIED="1462154922060" POSITION="right" TEXT="{tracked, unmodified, modified, staged, committed}">
<node CREATED="1388393139411" ID="ID_1198322338" MODIFIED="1388428836770" TEXT="3 states">
<node CREATED="1388393309462" ID="ID_965030898" MODIFIED="1461739217062" TEXT="committed(git dir)">
<node CREATED="1388393489022" ID="ID_1713031028" MODIFIED="1388393535819" TEXT="data is safely stored into local db"/>
</node>
<node CREATED="1388393316132" ID="ID_1754499234" MODIFIED="1388407990106" TEXT="modified(working dir)">
<node CREATED="1388393354735" ID="ID_1970315631" MODIFIED="1388393486385" TEXT="u&apos;v changed files but u&apos;v not committed them to local db"/>
</node>
<node CREATED="1388393318442" ID="ID_1166332858" MODIFIED="1461739271196" TEXT="staged (staging area)">
<node CREATED="1388393552276" ID="ID_531129478" MODIFIED="1388393605101" TEXT="u&apos;v maked a modified files in current version to go to next snapshot"/>
</node>
</node>
<node CREATED="1388404848201" ID="ID_929338838" MODIFIED="1461739360977" TEXT="4 file statuses">
<node CREATED="1388404921472" ID="ID_1741432755" MODIFIED="1388404924853" TEXT="untracked"/>
<node CREATED="1388404939757" ID="ID_1215600527" MODIFIED="1388404947342" TEXT="unmodified"/>
<node CREATED="1388404953743" ID="ID_1105900730" MODIFIED="1388405033066" TEXT="modified"/>
<node CREATED="1388404969724" ID="ID_1647168881" MODIFIED="1388404979651" TEXT="staged"/>
</node>
<node CREATED="1388418115452" ID="ID_1890857351" MODIFIED="1398388815897" TEXT="{,un}stage">
<node CREATED="1388418711304" ID="ID_1204132036" MODIFIED="1388419156969" TEXT="stage: git add file"/>
<node CREATED="1388418731242" ID="ID_801866843" MODIFIED="1388418751944" TEXT="unstage: git reset HEAD file"/>
</node>
<node CREATED="1388418125683" ID="ID_1192342049" MODIFIED="1398388824851" TEXT="{,un}track">
<node CREATED="1388418789771" ID="ID_1845032812" MODIFIED="1388418797120" TEXT="track: go add file"/>
<node CREATED="1388418797858" ID="ID_659443757" MODIFIED="1388418857355" TEXT="untrack: go rm --cached(reserved in working dir)  file"/>
</node>
<node CREATED="1388418592072" ID="ID_411125071" MODIFIED="1398388836815" TEXT="{,re,un}commit">
<node CREATED="1388419062725" ID="ID_1563550286" MODIFIED="1388419096912" TEXT="commit: go commit  -m &quot;msg&quot; file "/>
<node CREATED="1388419073125" ID="ID_1882064237" MODIFIED="1388419167970" TEXT="recommit: git commit --amend"/>
<node CREATED="1388419170759" ID="ID_488803026" MODIFIED="1388419176469" TEXT="uncommit:"/>
</node>
<node CREATED="1388418684781" ID="ID_1038911160" MODIFIED="1398388843383" TEXT="{,un}modify">
<node CREATED="1388418951763" ID="ID_233571135" MODIFIED="1388418974414" TEXT="modify: edit file by vim, emacs..."/>
<node CREATED="1388418977181" ID="ID_989273456" MODIFIED="1388419028224" TEXT="unmodify: git checkout -- file"/>
</node>
</node>
<node CREATED="1388466323927" ID="ID_650390457" MODIFIED="1461739437405" POSITION="right" TEXT="data orginization (committed)">
<node CREATED="1388466353035" ID="ID_542724640" MODIFIED="1388466358420" TEXT="repo"/>
<node CREATED="1388466396154" ID="ID_1237058911" MODIFIED="1388466400038" TEXT="refs">
<node CREATED="1388466358648" ID="ID_793029454" MODIFIED="1388466401906" TEXT="branch"/>
<node CREATED="1388466385133" ID="ID_1745700075" MODIFIED="1388466401905" TEXT="tag"/>
</node>
<node CREATED="1388466410400" ID="ID_1023269547" MODIFIED="1461739877138" TEXT="objects">
<node CREATED="1388466360233" ID="ID_1082817787" MODIFIED="1388466366701" TEXT="commit"/>
<node CREATED="1388466367093" ID="ID_312579178" MODIFIED="1388466368220" TEXT="tree"/>
<node CREATED="1388466369036" ID="ID_279714541" MODIFIED="1388466379166" TEXT="blob"/>
</node>
</node>
<node CREATED="1388421765122" ID="ID_362779812" MODIFIED="1462426301286" POSITION="right" TEXT="branch,merge,remote">
<node CREATED="1388457072086" ID="ID_15260548" MODIFIED="1388457523372" TEXT="branch">
<node CREATED="1388453883042" ID="ID_1086563901" MODIFIED="1397010100401" TEXT="list branch">
<node CREATED="1388453869109" ID="ID_336921305" MODIFIED="1388453888006" TEXT="git branch"/>
</node>
<node CREATED="1388453932983" ID="ID_449417820" MODIFIED="1461739884719" TEXT="create branch">
<node CREATED="1388453964751" ID="ID_1068191546" MODIFIED="1388453981414" TEXT="git branch &lt;branch_name&gt;"/>
</node>
<node CREATED="1388453909769" ID="ID_559384970" MODIFIED="1397010098638" TEXT="show branch">
<node CREATED="1388453913251" ID="ID_1148952541" MODIFIED="1388453929115" TEXT="git show &lt;branch_name&gt;"/>
</node>
<node CREATED="1388453941985" ID="ID_1088174342" MODIFIED="1461739922767" TEXT="checkout(switch) branch">
<node CREATED="1388453989951" ID="ID_1237745155" MODIFIED="1388454006100" TEXT="git checkout &lt;branch_name&gt;"/>
<node CREATED="1388454006542" ID="ID_294232429" MODIFIED="1388454061228" TEXT="git checkout -b &lt;branch_name&gt;">
<node CREATED="1388454027685" ID="ID_1648887280" MODIFIED="1388454093040" TEXT="git branch &lt;branch_name&gt;&amp;&amp;git checkout !#:2"/>
</node>
</node>
<node CREATED="1388457525221" ID="ID_377797980" MODIFIED="1388457529258" TEXT="delete branch">
<node CREATED="1388457530548" ID="ID_1610802377" MODIFIED="1388457547220" TEXT="git branch -d &lt;branch_name&gt;">
<node CREATED="1388457559758" ID="ID_1728653790" MODIFIED="1388457671830" TEXT="branch must be fully merged in its upstream branch."/>
<node CREATED="1388457673215" ID="ID_527941826" MODIFIED="1388457692676" TEXT="in HEAD if no upstream was set with --track or --set-upstream."/>
</node>
<node CREATED="1388457547671" ID="ID_1633323608" MODIFIED="1388457554586" TEXT="git branch -D &lt;branch_name&gt;">
<node CREATED="1388457713455" ID="ID_120519669" MODIFIED="1388457714427" TEXT="irrespective of its merged status."/>
</node>
</node>
</node>
<node CREATED="1388457081267" ID="ID_238527584" MODIFIED="1397009599984" TEXT="merge(three-way merge)">
<node CREATED="1388457087594" ID="ID_1942109399" MODIFIED="1388457188214" TEXT="checkout branch to merge into">
<node CREATED="1388457123237" ID="ID_1059599608" MODIFIED="1388457175445" TEXT="git checkout &lt;branch_name_merged_into&gt;"/>
</node>
<node CREATED="1388457178139" ID="ID_1211930587" MODIFIED="1397009603104" TEXT="merge">
<node CREATED="1388457194802" ID="ID_891616388" MODIFIED="1388457487788" TEXT="(fast forward) merge branch  into its ancestor"/>
<node CREATED="1388457205844" ID="ID_1452684423" MODIFIED="1388457404527" TEXT="(merge commit) merge two divergent branches with common ancestor"/>
</node>
<node CREATED="1388457789027" ID="ID_1584464702" MODIFIED="1397009606832" TEXT="show merge">
<node CREATED="1388457795580" ID="ID_974750270" MODIFIED="1388457819807" TEXT="git branch -v"/>
<node CREATED="1388457820190" ID="ID_1644814188" MODIFIED="1388457832331" TEXT="git branch --merged"/>
<node CREATED="1388457841237" ID="ID_439736269" MODIFIED="1388457855565" TEXT="git branch --no-merged"/>
</node>
<node CREATED="1388457742664" ID="ID_1442070953" MODIFIED="1388465767092" TEXT="merge conflicts"/>
</node>
<node CREATED="1388465827336" ID="ID_1040675531" MODIFIED="1398388933820" TEXT="rebase">
<node CREATED="1388465906927" ID="ID_1473001207" MODIFIED="1388465920632" TEXT="git rebase &lt;branch&gt;"/>
</node>
<node CREATED="1388459481013" ID="ID_463239250" MODIFIED="1398388936086" TEXT="remote">
<node CREATED="1388459606556" ID="ID_889941140" MODIFIED="1461740033033" TEXT="{add,rm,rename} remote repo">
<node CREATED="1388460331882" ID="ID_1468669391" MODIFIED="1388460399855" TEXT="git remote add --mirror={push,fetch} &lt;name&gt; &lt;url&gt;"/>
<node CREATED="1388460382231" ID="ID_804844967" MODIFIED="1388460406709" TEXT="git remote rm &lt;name&gt;"/>
<node CREATED="1388460418159" ID="ID_573972370" MODIFIED="1388460429114" TEXT="git remote rename &lt;old&gt; &lt;new&gt;"/>
</node>
<node CREATED="1388459734523" ID="ID_1649473928" MODIFIED="1397009659482" TEXT="create local branch for corresponding remote branch">
<node CREATED="1388459786807" ID="ID_523020657" MODIFIED="1388459805098" TEXT="git checkout -b &lt;local_branch&gt; &lt;remote_branch&gt;"/>
</node>
<node CREATED="1388459509612" ID="ID_336879807" MODIFIED="1397009677438" TEXT="track remote branch">
<node CREATED="1388459536151" ID="ID_1137928090" MODIFIED="1388459620090" TEXT="git checkout --track &lt;remote_branch&gt;"/>
<node CREATED="1388459624140" ID="ID_1160924987" MODIFIED="1388459647291" TEXT="git checkout --track -b &lt;local_branch&gt; &lt;remote_branch&gt;"/>
</node>
<node CREATED="1388460475383" ID="ID_1693299021" MODIFIED="1397010414391" TEXT="push(merge), pull(merge), fetch(!merge)">
<node CREATED="1388460492496" ID="ID_1136694605" MODIFIED="1388461040761" TEXT="git pull &lt;repo_name&gt; &lt;branch_name&gt;"/>
<node CREATED="1388460626370" ID="ID_1619039223" MODIFIED="1388460658876" TEXT="git pull (checkout tracking branch )"/>
<node CREATED="1388460605554" ID="ID_181600999" MODIFIED="1388461047086" TEXT="git push &lt;repo_name&gt; &lt;src_branch&gt;:&lt;dst_branch&gt;"/>
<node CREATED="1388460934747" ID="ID_766337995" MODIFIED="1388461056656" TEXT="git push &lt;repo_name&gt; &lt;branch&gt;"/>
<node CREATED="1388461057537" ID="ID_1421689328" MODIFIED="1388461077398" TEXT="git push (checkout tracking branch)"/>
<node CREATED="1388461089008" ID="ID_1285609446" MODIFIED="1388461097055" TEXT="git push --all"/>
<node CREATED="1388461103497" ID="ID_650951522" MODIFIED="1388464706249" TEXT="git fetch &lt;repo_name&gt; &lt;branch_name&gt;"/>
</node>
<node CREATED="1388464779079" ID="ID_1586969963" MODIFIED="1388464790903" TEXT="delete remote branch">
<node CREATED="1388464791735" ID="ID_530356100" MODIFIED="1388464820366" TEXT="git push &lt;repo_name&gt; :&lt;branch_name&gt;"/>
</node>
</node>
</node>
<node CREATED="1388422748407" ID="ID_980114663" MODIFIED="1398390510553" POSITION="right" TEXT="version(tagging)">
<node CREATED="1388423131333" ID="ID_145917228" MODIFIED="1388423132814" TEXT="git tag"/>
<node CREATED="1388423184114" ID="ID_186227362" MODIFIED="1388423198103" TEXT="git tag -l &quot;tagname glob&quot;"/>
<node CREATED="1388423289715" ID="ID_1343760079" MODIFIED="1388423294355" TEXT="git show &quot;tagname&quot;"/>
<node CREATED="1388422796341" ID="ID_303811536" MODIFIED="1461740207219" TEXT="git tag {,-s,-a} &quot;tagname&quot; &quot;commit SHA-1&quot;">
<node CREATED="1388423137488" ID="ID_101697499" MODIFIED="1388423211909" TEXT="default (lightweight)"/>
<node CREATED="1388423166592" ID="ID_340535467" MODIFIED="1388423299985" TEXT="-a (annotated)"/>
<node CREATED="1388423300409" ID="ID_516651304" MODIFIED="1388423314602" TEXT="-s (signed, GPG)"/>
</node>
<node CREATED="1388423337070" ID="ID_611399958" MODIFIED="1388423465024" TEXT="git tag -v &quot;tagname&quot; (verify signed tag)"/>
<node CREATED="1388423434889" ID="ID_1526000645" MODIFIED="1388423445854" TEXT="git push origin &quot;tagname&quot;"/>
<node CREATED="1388423446205" ID="ID_1346012806" MODIFIED="1388423458429" TEXT="git push origin --tags (push all tags)"/>
</node>
<node CREATED="1388408713937" ID="ID_1511751978" MODIFIED="1398390517213" POSITION="right" TEXT="print info">
<node CREATED="1388408813342" ID="ID_1033115232" MODIFIED="1388409284591" TEXT="{modified, staged}: git {status, git}">
<node CREATED="1388405152141" ID="ID_1261002558" MODIFIED="1388409222605" TEXT="(brief) git status"/>
<node CREATED="1388406273486" ID="ID_834703110" MODIFIED="1461740254778" TEXT="(detail) git diff: modified&amp;staged; staged&amp;committed">
<node CREATED="1388406284436" ID="ID_1491045853" MODIFIED="1388406287530" TEXT="git diff">
<node CREATED="1388406337888" ID="ID_747481266" MODIFIED="1388406366686" TEXT="diff modified and staged"/>
</node>
<node CREATED="1388406287779" ID="ID_1742286986" MODIFIED="1388406318260" TEXT="git diff --{cached, staged}">
<node CREATED="1388406369468" ID="ID_1613352623" MODIFIED="1388406377636" TEXT="diff staged and commited"/>
</node>
</node>
</node>
<node CREATED="1388407128064" ID="ID_27222981" MODIFIED="1398390518650" TEXT="{committed}: git log">
<node CREATED="1388414385935" ID="ID_1369630623" MODIFIED="1388414388083" TEXT="git log"/>
<node CREATED="1388414403288" ID="ID_1425007276" MODIFIED="1388414517507" TEXT="git log -p/--patch -2"/>
<node CREATED="1388414536704" ID="ID_360970020" MODIFIED="1388414541195" TEXT="git log --stat"/>
<node CREATED="1388414605548" ID="ID_33214395" MODIFIED="1388414620126" TEXT="git log --pretty=oneline"/>
<node CREATED="1388414644229" ID="ID_540865490" MODIFIED="1388414771223" TEXT="git log --pretty=format:&quot;%h - %an, %nr: %s&quot;">
<node CREATED="1388414858703" ID="ID_363809951" MODIFIED="1388414860532" TEXT="format"/>
</node>
<node CREATED="1388414791148" ID="ID_1129823016" MODIFIED="1388414820540" TEXT="git log --pretty=format:&quot;%h %s&quot; --graph"/>
</node>
</node>
<node CREATED="1388165759092" ID="ID_1064709093" MODIFIED="1461740323854" POSITION="right" TEXT="git internals">
<node CREATED="1388166043413" ID="ID_1001089878" MODIFIED="1398388953688" TEXT=".git">
<node CREATED="1388166168099" ID="ID_967087050" MODIFIED="1388166174834" TEXT="COMMIT_EDITMSG"/>
<node CREATED="1388166175159" ID="ID_717278590" MODIFIED="1388166264073" TEXT="config (project-specific conf)"/>
<node CREATED="1388166177958" ID="ID_757822126" MODIFIED="1388166412158" TEXT="hooks (client- and server-side host scripts)"/>
<node CREATED="1388166183165" ID="ID_250274210" MODIFIED="1388166370926" TEXT="info (exclude file, .gitignore)"/>
<node CREATED="1388166192188" ID="ID_1452057250" MODIFIED="1388166228110" TEXT="description (GitWeb)"/>
<node CREATED="1388166438231" ID="ID_1809293976" MODIFIED="1388193831994" TEXT="core">
<node CREATED="1388166184350" ID="ID_1961569164" MODIFIED="1398388991028" TEXT="objects (content-addressable fs,key(SHA-1)/value(blob) storage)">
<node CREATED="1388167343748" ID="ID_831750038" MODIFIED="1388167365323" TEXT="write">
<node CREATED="1388167245625" ID="ID_1439706676" MODIFIED="1388167346889" TEXT="$git hash-object -w --stdin">
<node CREATED="1388167278389" ID="ID_1250456162" MODIFIED="1388167331984" TEXT="SHA-1 (40char)"/>
</node>
</node>
<node CREATED="1388167354050" ID="ID_857494160" MODIFIED="1388167359801" TEXT="read">
<node CREATED="1388167373596" ID="ID_1277608804" MODIFIED="1388167393100" TEXT="$git cat-file -p &lt;SHA-1&gt;"/>
</node>
</node>
<node CREATED="1388166187820" ID="ID_438391059" MODIFIED="1388166542466" TEXT="refs (pointers into commit objects )"/>
<node CREATED="1388166189308" ID="ID_773491548" MODIFIED="1388166572776" TEXT="HEAD (branch checked out)"/>
<node CREATED="1388166204960" ID="ID_395255274" MODIFIED="1461740379099" TEXT="index (staging area information)">
<node CREATED="1388166585395" ID="ID_1451360916" MODIFIED="1388166585395" TEXT=""/>
</node>
</node>
<node CREATED="1388166206249" ID="ID_1903975591" MODIFIED="1388166207171" TEXT="logs"/>
<node CREATED="1388166207504" ID="ID_166817996" MODIFIED="1388166211364" TEXT="packed-refs"/>
</node>
<node CREATED="1388166050049" ID="ID_19003144" MODIFIED="1388166055850" TEXT=".gitignore"/>
<node CREATED="1388166056386" ID="ID_1724704867" MODIFIED="1388166063064" TEXT="README.md"/>
</node>
</node>
</map>