forked from ndp/git-cheatsheet
-
Notifications
You must be signed in to change notification settings - Fork 0
/
git-cheatsheet.html
274 lines (270 loc) · 22.2 KB
/
git-cheatsheet.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<title>NDP Software :: Git Cheatsheet</title>
<link rel="SHORTCUT ICON" href="/favicon.ico"/>
<meta name="viewport"
content="width=device-width, initial-scale=1.0"/>
<meta name="description"
content="Interactive Git Cheatsheet, categorizing commands based on what they affect.">
<meta name="keywords"
content="Git Cheatsheet Cheat sheet Kuleta chuleta chivo machete torpedo acordeón cribsheet crib sheet antisèche Planquadratangabe Nachschlagewerk"/>
<meta property=”og:type” content=”website”/>
<meta property=”og:title” content=”NDP Software :: Git Cheatsheet”/>
<script>
var _rollbarConfig = {
accessToken: "c176f55eef3c41668c078e83aedcd27e",
captureUncaught: true,
captureUnhandledRejections: true,
payload: {
host: document.location.hostname,
environment: document.location.hostname === 'ndpsoftware.com' || document.location.hostname === 'www.ndpsoftware.com'
? 'production'
: 'dev',
}
};
// Rollbar Snippet
!function(r){var e={};function o(n){if(e[n])return e[n].exports;var t=e[n]={i:n,l:!1,exports:{}};return r[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.m=r,o.c=e,o.d=function(r,e,n){o.o(r,e)||Object.defineProperty(r,e,{enumerable:!0,get:n})},o.r=function(r){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(r,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(r,"__esModule",{value:!0})},o.t=function(r,e){if(1&e&&(r=o(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var t in r)o.d(n,t,function(e){return r[e]}.bind(null,t));return n},o.n=function(r){var e=r&&r.__esModule?function(){return r.default}:function(){return r};return o.d(e,"a",e),e},o.o=function(r,e){return Object.prototype.hasOwnProperty.call(r,e)},o.p="",o(o.s=0)}([function(r,e,o){"use strict";var n=o(1),t=o(5);_rollbarConfig=_rollbarConfig||{},_rollbarConfig.rollbarJsUrl=_rollbarConfig.rollbarJsUrl||"https://cdn.rollbar.com/rollbarjs/refs/tags/v2.19.2/rollbar.min.js",_rollbarConfig.async=void 0===_rollbarConfig.async||_rollbarConfig.async;var a=n.setupShim(window,_rollbarConfig),l=t(_rollbarConfig);window.rollbar=n.Rollbar,a.loadFull(window,document,!_rollbarConfig.async,_rollbarConfig,l)},function(r,e,o){"use strict";var n=o(2),t=o(3);function a(r){return function(){try{return r.apply(this,arguments)}catch(r){try{console.error("[Rollbar]: Internal error",r)}catch(r){}}}}var l=0;function i(r,e){this.options=r,this._rollbarOldOnError=null;var o=l++;this.shimId=function(){return o},"undefined"!=typeof window&&window._rollbarShims&&(window._rollbarShims[o]={handler:e,messages:[]})}var s=o(4),d=function(r,e){return new i(r,e)},c=function(r){return new s(d,r)};function u(r){return a((function(){var e=this,o=Array.prototype.slice.call(arguments,0),n={shim:e,method:r,args:o,ts:new Date};window._rollbarShims[this.shimId()].messages.push(n)}))}i.prototype.loadFull=function(r,e,o,n,t){var l=!1,i=e.createElement("script"),s=e.getElementsByTagName("script")[0],d=s.parentNode;i.crossOrigin="",i.src=n.rollbarJsUrl,o||(i.async=!0),i.onload=i.onreadystatechange=a((function(){if(!(l||this.readyState&&"loaded"!==this.readyState&&"complete"!==this.readyState)){i.onload=i.onreadystatechange=null;try{d.removeChild(i)}catch(r){}l=!0,function(){var e;if(void 0===r._rollbarDidLoad){e=new Error("rollbar.js did not load");for(var o,n,a,l,i=0;o=r._rollbarShims[i++];)for(o=o.messages||[];n=o.shift();)for(a=n.args||[],i=0;i<a.length;++i)if("function"==typeof(l=a[i])){l(e);break}}"function"==typeof t&&t(e)}()}})),d.insertBefore(i,s)},i.prototype.wrap=function(r,e,o){try{var n;if(n="function"==typeof e?e:function(){return e||{}},"function"!=typeof r)return r;if(r._isWrap)return r;if(!r._rollbar_wrapped&&(r._rollbar_wrapped=function(){o&&"function"==typeof o&&o.apply(this,arguments);try{return r.apply(this,arguments)}catch(o){var e=o;throw e&&("string"==typeof e&&(e=new String(e)),e._rollbarContext=n()||{},e._rollbarContext._wrappedSource=r.toString(),window._rollbarWrappedError=e),e}},r._rollbar_wrapped._isWrap=!0,r.hasOwnProperty))for(var t in r)r.hasOwnProperty(t)&&(r._rollbar_wrapped[t]=r[t]);return r._rollbar_wrapped}catch(e){return r}};for(var p="log,debug,info,warn,warning,error,critical,global,configure,handleUncaughtException,handleAnonymousErrors,handleUnhandledRejection,captureEvent,captureDomContentLoaded,captureLoad".split(","),f=0;f<p.length;++f)i.prototype[p[f]]=u(p[f]);r.exports={setupShim:function(r,e){if(r){var o=e.globalAlias||"Rollbar";if("object"==typeof r[o])return r[o];r._rollbarShims={},r._rollbarWrappedError=null;var l=new c(e);return a((function(){e.captureUncaught&&(l._rollbarOldOnError=r.onerror,n.captureUncaughtExceptions(r,l,!0),e.wrapGlobalEventHandlers&&t(r,l,!0)),e.captureUnhandledRejections&&n.captureUnhandledRejections(r,l,!0);var a=e.autoInstrument;return!1!==e.enabled&&(void 0===a||!0===a||"object"==typeof a&&a.network)&&r.addEventListener&&(r.addEventListener("load",l.captureLoad.bind(l)),r.addEventListener("DOMContentLoaded",l.captureDomContentLoaded.bind(l))),r[o]=l,l}))()}},Rollbar:c}},function(r,e,o){"use strict";function n(r,e,o,n){r._rollbarWrappedError&&(n[4]||(n[4]=r._rollbarWrappedError),n[5]||(n[5]=r._rollbarWrappedError._rollbarContext),r._rollbarWrappedError=null);var t=e.handleUncaughtException.apply(e,n);o&&o.apply(r,n),"anonymous"===t&&(e.anonymousErrorsPending+=1)}r.exports={captureUncaughtExceptions:function(r,e,o){if(r){var t;if("function"==typeof e._rollbarOldOnError)t=e._rollbarOldOnError;else if(r.onerror){for(t=r.onerror;t._rollbarOldOnError;)t=t._rollbarOldOnError;e._rollbarOldOnError=t}e.handleAnonymousErrors();var a=function(){var o=Array.prototype.slice.call(arguments,0);n(r,e,t,o)};o&&(a._rollbarOldOnError=t),r.onerror=a}},captureUnhandledRejections:function(r,e,o){if(r){"function"==typeof r._rollbarURH&&r._rollbarURH.belongsToShim&&r.removeEventListener("unhandledrejection",r._rollbarURH);var n=function(r){var o,n,t;try{o=r.reason}catch(r){o=void 0}try{n=r.promise}catch(r){n="[unhandledrejection] error getting `promise` from event"}try{t=r.detail,!o&&t&&(o=t.reason,n=t.promise)}catch(r){}o||(o="[unhandledrejection] error getting `reason` from event"),e&&e.handleUnhandledRejection&&e.handleUnhandledRejection(o,n)};n.belongsToShim=o,r._rollbarURH=n,r.addEventListener("unhandledrejection",n)}}}},function(r,e,o){"use strict";function n(r,e,o){if(e.hasOwnProperty&&e.hasOwnProperty("addEventListener")){for(var n=e.addEventListener;n._rollbarOldAdd&&n.belongsToShim;)n=n._rollbarOldAdd;var t=function(e,o,t){n.call(this,e,r.wrap(o),t)};t._rollbarOldAdd=n,t.belongsToShim=o,e.addEventListener=t;for(var a=e.removeEventListener;a._rollbarOldRemove&&a.belongsToShim;)a=a._rollbarOldRemove;var l=function(r,e,o){a.call(this,r,e&&e._rollbar_wrapped||e,o)};l._rollbarOldRemove=a,l.belongsToShim=o,e.removeEventListener=l}}r.exports=function(r,e,o){if(r){var t,a,l="EventTarget,Window,Node,ApplicationCache,AudioTrackList,ChannelMergerNode,CryptoOperation,EventSource,FileReader,HTMLUnknownElement,IDBDatabase,IDBRequest,IDBTransaction,KeyOperation,MediaController,MessagePort,ModalWindow,Notification,SVGElementInstance,Screen,TextTrack,TextTrackCue,TextTrackList,WebSocket,WebSocketWorker,Worker,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload".split(",");for(t=0;t<l.length;++t)r[a=l[t]]&&r[a].prototype&&n(e,r[a].prototype,o)}}},function(r,e,o){"use strict";function n(r,e){this.impl=r(e,this),this.options=e,function(r){for(var e=function(r){return function(){var e=Array.prototype.slice.call(arguments,0);if(this.impl[r])return this.impl[r].apply(this.impl,e)}},o="log,debug,info,warn,warning,error,critical,global,configure,handleUncaughtException,handleAnonymousErrors,handleUnhandledRejection,_createItem,wrap,loadFull,shimId,captureEvent,captureDomContentLoaded,captureLoad".split(","),n=0;n<o.length;n++)r[o[n]]=e(o[n])}(n.prototype)}n.prototype._swapAndProcessMessages=function(r,e){var o,n,t;for(this.impl=r(this.options);o=e.shift();)n=o.method,t=o.args,this[n]&&"function"==typeof this[n]&&("captureDomContentLoaded"===n||"captureLoad"===n?this[n].apply(this,[t[0],o.ts]):this[n].apply(this,t));return this},r.exports=n},function(r,e,o){"use strict";r.exports=function(r){return function(e){if(!e&&!window._rollbarInitialized){for(var o,n,t=(r=r||{}).globalAlias||"Rollbar",a=window.rollbar,l=function(r){return new a(r)},i=0;o=window._rollbarShims[i++];)n||(n=o.handler),o.handler._swapAndProcessMessages(l,o.messages);window[t]=n,window._rollbarInitialized=!0}}}}]);
// End Rollbar Snippet
</script>
<link href="git-cheatsheet/styles.css?4" rel="stylesheet" type="text/css"/>
<link href='//fonts.googleapis.com/css?family=Source+Code+Pro:400,700' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Merriweather:300,400' rel='stylesheet' type='text/css'>
<link href="git-cheatsheet/fonts/Impact-Label-fontfacekit/stylesheet.css" type="text/css" rel="stylesheet" />
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-1458227-1', 'auto');
ga('send', 'pageview');
</script>
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "Organization",
"name" : "NDP Software",
"url": "https://ndpsoftware.com",
"sameAs" : [
"https://www.linkedin.com/in/ndpsoftware",
"https://github.com/ndp",
"https://www.twitter.com/ndp8",
"https://www.facebook.com/ndpsoft"
],
"logo": "https://ndpsoftware.com/images/brand/logo-square.png"
}
</script>
</head>
<body>
<div id="hd" class="container_16">
<div class="grid_8 alpha">
<h1 data-docs="Categorize Git's commands based on what they affect.">Git Cheatsheet</h1>
<h2 data-docs="another visualization from Andrew Peterson, NDP Software."><a href="https://ndpsoftware.com">an
interaction
from NDP Software</a></h2>
<h6>(c) <a href="https://ndpsoftware.com">Andrew Peterson</a> 2009-2021 All Rights Reserved.
</h6>
<h4>
<a class="lang" data-lang="en">en</a>
<a class="lang" data-lang="fr" data-docs="French translation by Bernard Opic">fr</a>
<a class="lang" data-lang="it" data-docs="Italian translation by Antonio Pantaleo">it</a>
<a class="lang" data-lang="es" data-docs="Spanish translation by sminutoli">es</a>
<a class="lang" data-lang="de" data-docs="German translation by Kai Winter">de</a>
<a class="lang" data-lang="zh-cn" data-docs="Simplified Chinese translation by Ace Code">简</a>
<a class="lang" data-lang="ko" data-docs="Korean translation by ujuc">한국어</a>
</h4>
</div>
<div class="grid_8 omega" style="float: right;padding-right: 15px;">
<ul>
<li><a href="http://justinhileman.info/article/git-pretty/git-pretty.png"
target="_blank"
rel="noopener"
onclick="ga('send', { hitType: 'event', eventCategory: 'git-cheatsheet', eventAction: 'refer', eventLabel: 'git-pretty'})">escape a git mess,
step-by-step»</a></li>
<li><a href="https://www.amp-what.com?utm_source=Git+Cheatsheet&utm_campaign=Text+Link&utm_medium=web"
target="_blank"
rel="noopener"
onclick="ga('send', { hitType: 'event', eventCategory: 'git-cheatsheet', eventAction: 'refer', eventLabel: 'amp-what'})">discover character
entities at &what»</a></li>
</ul>
</div>
</div>
<div id="diagram" class="container_16">
<section id="stash" class="loc grid_2 alpha"><h5>stash</h5></section>
<section id="workspace" class="loc grid_3"><h5>workspace</h5></section>
<section id="index" class="loc grid_3"><h5>index</h5></section>
<section id="local_repo" class="loc grid_3"><h5>local repository</h5></section>
<section id="remote_repo" class="loc grid_3"><h5>upstream repository</h5></section>
<section class="grid_2 omega" style='overflow: hidden'>
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- Git Cheatsheet – Wide Skyscraper -->
<ins class="adsbygoogle"
style="display:inline-block;width:160px;height:600px"
data-ad-client="ca-pub-6893651588300115"
data-ad-slot="6274733676"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
</section>
<dl id="commands">
<dt>status</dt>
<dd>Displays paths that have differences between the index file and the current HEAD commit, paths that have
differences between the workspace and the index file, and paths in the workspace that are not tracked by git.
</dd>
<dt>diff</dt>
<dd>Displays the differences not added to the index.</dd>
<dt>diff <em>commit or branch</em></dt>
<dd>View the changes you have in your workspace relative to the named <em>commit</em>. You can use HEAD
to compare it with the latest commit, or a branch name to compare with the tip of a different branch
</dd>
<dt>add <em>file... or dir...</em></dt>
<dd>Adds the current content of new or modified files to the index, thus staging that content for inclusion in the
next commit. Use <code>add --interactive</code> to add the modified contents in the workspace
interactively to the index.
</dd>
<dt>add -u</dt>
<dd>Adds the current content of modified (NOT NEW) files to the index. This is similar to what 'git commit -a' does
in preparation for making a commit.
</dd>
<dt>rm <em>file(s)...</em></dt>
<dd>Remove a file from the workspace and the index.</dd>
<dt>mv <em>file(s)...</em></dt>
<dd>Move file in the workspace and the index.</dd>
<dt>commit -a <span class="optional">-m 'msg'</span></dt>
<dd>Commit all files changed since your last commit, except untracked files (ie. all files that are already listed
in the index). Remove files in the index that have been removed from the workspace.
</dd>
<dt>checkout <em>files(s)... or dir</em></dt>
<dd>Updates the file or directory in the workspace. Does NOT switch branches.</dd>
<dt>reset HEAD <em>file(s)...</em></dt>
<dd>Remove the specified files from the next commit. Resets the index but not the working tree (i.e., the changed
files are preserved but not marked for commit) and reports what has not been updated.
</dd>
<dt>reset --soft HEAD^</dt>
<dd>Undo the last commit, leaving changes in the index.</dd>
<dt>reset --hard</dt>
<dd>Matches the workspace and index to the local tree. WARNING: Any changes to tracked files in the working tree
since commit are lost. Use this if merging has resulted in conflicts and you'd like to start over. Pass ORIG_HEAD
to undo the most recent successful merge and any changes after.
</dd>
<dt>checkout <em>branch</em></dt>
<dd>Switches branches by updating the index and workspace to reflect the specified branch, <em>branch</em>,
and updating HEAD to be <em>branch</em>.
</dd>
<dt>checkout -b <em>name of new branch</em></dt>
<dd>Create a branch and switch to it</dd>
<dt>merge <em>commit or branch</em></dt>
<dd>Merge changes from <em>branch name</em> into current branch.<br>Use <code>&#8209;&#8209;no-commit</code>
to leave changes uncommitted.
</dd>
<dt>rebase <em>upstream</em></dt>
<dd>Reverts all commits since the current branch diverged from <em>upstream</em>, and then re-applies
them one-by-one on top of changes from the HEAD of <em>upstream</em>.
</dd>
<dt>cherry-pick <em>commit</em></dt>
<dd>Integrate changes in the given commit into the current branch.</dd>
<dt>revert <em>commit</em></dt>
<dd>Reverse commit specified by <em>commit</em> and commit the result. This requires your working tree
to be clean (no modifications from the HEAD commit).
</dd>
<dt>diff --cached <span class="optional"><em>commit</em></span></dt>
<dd>View the changes you staged vs the latest commit. Can pass a <em>commit</em> to see changes relative
to it.
</dd>
<dt>commit <span class="optional">-m 'msg'</span></dt>
<dd>Stores the current contents of the index in a new commit along with a log message from the user describing the
changes.
</dd>
<dt>commit --amend</dt>
<dd>Modify the last commit with the current index changes.</dd>
<dt>log</dt>
<dd>Show recent commits, most recent on top. Options:<br><code>&#8209;&#8209;decorate</code>
with branch and tag names on appropriate commits<br><code>&#8209;&#8209;stat</code> with
stats (files changed, insertions, and deletions) <br><code>&#8209;&#8209;author=<em>author</em></code>
only by a certain author<br><code>&#8209;&#8209;after="MMM DD YYYY"</code> ex. ("Jun 20
2008") only commits after a certain date<br><code>&#8209;&#8209;before="MMM DD YYYY"</code>
only commits that occur before a certain date <br><code>&#8209;&#8209;merge</code> only
the commits involved in the current merge conflicts
</dd>
<dt>diff <em>commit</em> <em>commit</em></dt>
<dd>View the changes between two arbitrary commits</dd>
<dt>branch</dt>
<dd>List all existing branches. Option -r causes the remote-tracking branches to be listed, and option -a shows
both.
</dd>
<dt>branch -d <em>branch</em></dt>
<dd>Delete an specified branch. Use -D to force.</dd>
<dt>branch --track <em>new</em> <em>remote/branch</em></dt>
<dd>Create a new local branch that tracks a remote branch.</dd>
<dt>clone <em>repo</em></dt>
<dd>Download the repository specified by <em>repo</em> and checkout HEAD of the master branch.</dd>
<dt>pull <em>remote</em> <em>refspec</em></dt>
<dd>Incorporates changes from a remote repository into the current branch. In its default mode, <code>git pull</code>
is shorthand for <code>git fetch</code> followed by <code>git merge FETCH_HEAD</code>.
</dd>
<dt>reset --hard <em>remote</em>/<em>branch</em></dt>
<dd>Reset local repo and working tree to match a remote branch. Use <code>reset &#8209;&#8209;hard
origin/master</code> to throw away all commits to the local master branch. Use this to start over on a
failed merge.
</dd>
<dt>fetch <em>remote</em> <em>refspec</em></dt>
<dd>Download objects and refs from another repository.</dd>
<dt>push</dt>
<dd>update the server with your commits across all branches that are *COMMON* between your local copy and the
server.Local branches that were never pushed to the server in the first place are not shared
</dd>
<dt>push <em>remote</em> <em>branch</em></dt>
<dd>Push new (or existing) branch to remote repository</dd>
<dt>push <em>remote</em> <em>branch</em>:<em>branch</em></dt>
<dd>Push new branch to remote repository with a different name</dd>
<dt>branch -r</dt>
<dd>List remote branches</dd>
<dt>push <em>remote</em> :<em>branch</em></dt>
<dd>Remove a remote branch. Literally &quot;push nothing to this branch&quot;</dd>
<dt>clean</dt>
<dd>Cleans the working tree by recursively removing files that are not under version control, starting from the
current directory.
</dd>
<dt>stash save <span class="optional"><em>msg</em></span></dt>
<dd>Save your local modifications to a new stash, and run git reset &#8209;&#8209;hard to revert them. The
<em>msg</em> part is optional and gives the description along with the stashed state. For quickly
making a snapshot, you can omit both "save" and <em>msg</em>.
</dd>
<dt>stash apply <span class="optional"><em>stash</em></span></dt>
<dd>Move changes from the specified stash into the workspace. The latest stash is the default.</dd>
<dt>stash pop</dt>
<dd>Applies the changes from the last (or specified) stash and then removes the given stash.</dd>
<dt>stash list</dt>
<dd>List the stashes that you currently have.</dd>
<dt>stash show <span class="optional"><em>stash</em></span></dt>
<dd>Show the changes recorded in the stash as a diff between the stashed state and its original parent. When no <em>stash</em>
is given, shows the latest one.
</dd>
<dt>stash drop <span class="optional"><em>stash</em></span></dt>
<dd>Remove a single stashed state from the stash list. When no <em>stash</em> is given, it removes the
latest one.
</dd>
<dt>stash clear</dt>
<dd>Remove all the stashed states. Note that those states will then be subject to pruning, and may be impossible to
recover.
</dd>
<dt>stash branch <em>branchname</em> <span class="optional"><em>stash</em></span></dt>
<dd>Creates and checks out a new branch named <em>branchname</em> starting from the commit at which the
<em>stash</em> was originally created, applies the changes recorded in <em>stash</em> to
the new working tree and index. <br>If that succeeds, and <em>stash</em> is a reference of the
form stash@{<em>revision</em>}, it then drops the <em>stash</em>. When no <em>stash</em>
is given, applies the latest one. <br>This is useful if the branch on which you ran git stash save has
changed enough that git stash apply fails due to conflicts. Since the stash is applied on top of the commit that
was HEAD at the time git stash was run, it restores the originally stashed state with no conflicts.
</dd>
</dl>
<div id="info">
<div class="screen"></div>
<div class="cmd"> </div>
<div class="doc"> </div>
</div>
</div>
</body>
<script src='git-cheatsheet/main.js?v=4'></script>
</html>