aboutsummaryrefslogtreecommitdiffhomepage
path: root/git.html
diff options
context:
space:
mode:
authorjohannst <johannst@users.noreply.github.com>2020-03-17 22:48:49 +0000
committerjohannst <johannst@users.noreply.github.com>2020-03-17 22:48:49 +0000
commit2a064a9d1bbb8de6ce489b685cce026eee167cd2 (patch)
tree123cdb825636f0bfe98ef152ace16eb8b3ae2647 /git.html
parent21e8db012f8c46f75e43a40da3f3e2676363c291 (diff)
downloadnotes-2a064a9d1bbb8de6ce489b685cce026eee167cd2.tar.gz
notes-2a064a9d1bbb8de6ce489b685cce026eee167cd2.zip
deploy: fb719f52b73920fb18c7f3080ebb1fc73300be49
Diffstat (limited to 'git.html')
-rw-r--r--git.html29
1 files changed, 15 insertions, 14 deletions
diff --git a/git.html b/git.html
index 54ebae5..53227fa 100644
--- a/git.html
+++ b/git.html
@@ -81,7 +81,7 @@
<nav id="sidebar" class="sidebar" aria-label="Table of contents">
<div id="sidebar-scrollbox" class="sidebar-scrollbox">
- <ol class="chapter"><li class="expanded "><a href="ld.so.html"><strong aria-hidden="true">1.</strong> ld.so</a></li><li class="expanded "><a href="git.html" class="active"><strong aria-hidden="true">2.</strong> git</a></li><li class="expanded "><a href="gdb.html"><strong aria-hidden="true">3.</strong> gdb</a></li><li class="expanded "><a href="radare2.html"><strong aria-hidden="true">4.</strong> radare2</a></li><li class="expanded "><a href="emacs.html"><strong aria-hidden="true">5.</strong> emacs</a></li><li class="expanded "><a href="fish.html"><strong aria-hidden="true">6.</strong> fish</a></li><li class="expanded "><a href="strace.html"><strong aria-hidden="true">7.</strong> strace</a></li><li class="expanded "><a href="lsof.html"><strong aria-hidden="true">8.</strong> lsof</a></li><li class="expanded "><a href="pidstat.html"><strong aria-hidden="true">9.</strong> pidstat</a></li><li class="expanded "><a href="time.html"><strong aria-hidden="true">10.</strong> time</a></li><li class="expanded "><a href="pmap.html"><strong aria-hidden="true">11.</strong> pmap</a></li><li class="expanded "><a href="pstack.html"><strong aria-hidden="true">12.</strong> pstack</a></li><li class="expanded "><a href="perf.html"><strong aria-hidden="true">13.</strong> perf</a></li><li class="expanded "><a href="oprofile.html"><strong aria-hidden="true">14.</strong> OProfile</a></li><li class="expanded "><a href="od.html"><strong aria-hidden="true">15.</strong> od</a></li><li class="expanded "><a href="xxd.html"><strong aria-hidden="true">16.</strong> xxd</a></li><li class="expanded "><a href="readelf.html"><strong aria-hidden="true">17.</strong> readelf</a></li><li class="expanded "><a href="objdump.html"><strong aria-hidden="true">18.</strong> objdump</a></li><li class="expanded "><a href="nm.html"><strong aria-hidden="true">19.</strong> nm</a></li><li class="expanded "><a href="c++filt.html"><strong aria-hidden="true">20.</strong> c++filt</a></li></ol>
+ <ol class="chapter"><li class="expanded "><a href="ld.so.html"><strong aria-hidden="true">1.</strong> ld.so</a></li><li class="expanded "><a href="git.html" class="active"><strong aria-hidden="true">2.</strong> git</a></li><li class="expanded "><a href="awk.html"><strong aria-hidden="true">3.</strong> awk</a></li><li class="expanded "><a href="gdb.html"><strong aria-hidden="true">4.</strong> gdb</a></li><li class="expanded "><a href="radare2.html"><strong aria-hidden="true">5.</strong> radare2</a></li><li class="expanded "><a href="emacs.html"><strong aria-hidden="true">6.</strong> emacs</a></li><li class="expanded "><a href="fish.html"><strong aria-hidden="true">7.</strong> fish</a></li><li class="expanded "><a href="strace.html"><strong aria-hidden="true">8.</strong> strace</a></li><li class="expanded "><a href="lsof.html"><strong aria-hidden="true">9.</strong> lsof</a></li><li class="expanded "><a href="pidstat.html"><strong aria-hidden="true">10.</strong> pidstat</a></li><li class="expanded "><a href="time.html"><strong aria-hidden="true">11.</strong> time</a></li><li class="expanded "><a href="pgrep.html"><strong aria-hidden="true">12.</strong> pgrep</a></li><li class="expanded "><a href="pstack.html"><strong aria-hidden="true">13.</strong> pstack</a></li><li class="expanded "><a href="pstack.html"><strong aria-hidden="true">14.</strong> pstack</a></li><li class="expanded "><a href="perf.html"><strong aria-hidden="true">15.</strong> perf</a></li><li class="expanded "><a href="oprofile.html"><strong aria-hidden="true">16.</strong> OProfile</a></li><li class="expanded "><a href="od.html"><strong aria-hidden="true">17.</strong> od</a></li><li class="expanded "><a href="xxd.html"><strong aria-hidden="true">18.</strong> xxd</a></li><li class="expanded "><a href="readelf.html"><strong aria-hidden="true">19.</strong> readelf</a></li><li class="expanded "><a href="objdump.html"><strong aria-hidden="true">20.</strong> objdump</a></li><li class="expanded "><a href="nm.html"><strong aria-hidden="true">21.</strong> nm</a></li><li class="expanded "><a href="c++filt.html"><strong aria-hidden="true">22.</strong> c++filt</a></li></ol>
</div>
<div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
</nav>
@@ -149,15 +149,15 @@
<div id="content" class="content">
<main>
<h1><a class="header" href="#git1" id="git1">git(1)</a></h1>
-<h2><a class="header" href="#misc" id="misc">Misc</a></h2>
+<h2><a class="header" href="#staging" id="staging">staging</a></h2>
<pre><code class="language-markdown"> git add -p [&lt;file&gt;] ............ partial staging (interactive)
</code></pre>
-<h2><a class="header" href="#remote" id="remote">remote</a></h2>
+<h2><a class="header" href="#remote" id="remote">Remote</a></h2>
<pre><code class="language-markdown"> git remote -v .................. list remotes verbose (with URLs)
git remote show [-n] &lt;remote&gt; .. list info for &lt;remote&gt; (like remote HEAD,
remote branches, tracking mapping)
</code></pre>
-<h2><a class="header" href="#branching" id="branching">branching</a></h2>
+<h2><a class="header" href="#branching" id="branching">Branching</a></h2>
<pre><code class="language-markdown"> git branch [-a] ................ list available branches; -a to include
remote branches
git branch -vv ................. list branch &amp; annotate with head sha1 &amp;
@@ -167,7 +167,7 @@
git push -u origin &lt;rbname&gt; .... push branch to origin (or other remote), and
setup &lt;rbname&gt; as tracking branch
</code></pre>
-<h2><a class="header" href="#resetting" id="resetting">resetting</a></h2>
+<h2><a class="header" href="#resetting" id="resetting">Resetting</a></h2>
<pre><code class="language-markdown"> git reset [opt] &lt;ref|commit&gt;
opt:
--mixed .................... resets index, but not working tree
@@ -179,25 +179,26 @@
git reset --soft HEAD~1 ........ delete most recent commit but keep work
git reset --hard HEAD~1 ........ delete most recent commit and delete work
</code></pre>
-<h2><a class="header" href="#tags" id="tags">tags</a></h2>
+<h2><a class="header" href="#tags" id="tags">Tags</a></h2>
<pre><code class="language-markdown"> git tag -a &lt;tname&gt; -m &quot;descr&quot; ........ creates an annotated tag (full object
containing tagger, date, ...)
git tag -l ........................... list available tags
git checkout tag/&lt;tname&gt; ............. checkout specific tag
git checkout tag/&lt;tname&gt; -b &lt;bname&gt; .. checkout specific tag in a new branch
</code></pre>
-<h2><a class="header" href="#diff" id="diff">diff</a></h2>
+<h2><a class="header" href="#diff" id="diff">Diff</a></h2>
<pre><code class="language-markdown"> git diff HEAD:&lt;fname&gt; origin/HEAD:&lt;fname&gt; ... diff files for different refs
git diff -U$(wc -l &lt;fname&gt;) &lt;fname&gt; ......... shows complete file with diffs
instead of usual diff snippets
</code></pre>
-<h2><a class="header" href="#log" id="log">log</a></h2>
+<h2><a class="header" href="#log" id="log">Log</a></h2>
<pre><code class="language-markdown"> git log --oneline .... shows log in single line per commit -&gt; alias for
'--pretty=oneline --abbrev-commit'
git log --graph ...... text based graph of commit history
git log --decorate ... decorate log with REFs
+ git log -p &lt;file&gt; .... show commit history + diffs for &lt;file&gt;
</code></pre>
-<h2><a class="header" href="#patching" id="patching">patching</a></h2>
+<h2><a class="header" href="#patching" id="patching">Patching</a></h2>
<pre><code class="language-markdown"> git format-patch &lt;opt&gt; &lt;since&gt;/&lt;revision range&gt;
opt:
-N ................... use [PATCH] instead [PATCH n/m] in subject when
@@ -221,7 +222,7 @@
# generate single patch file from a certain commit/ref
git format-patch &lt;COMMIT/REF&gt; --stdout &gt; my-patch.patch
</code></pre>
-<h2><a class="header" href="#submodules" id="submodules">submodules</a></h2>
+<h2><a class="header" href="#submodules" id="submodules">Submodules</a></h2>
<pre><code class="language-markdown"> git submodule add &lt;url&gt; [&lt;path&gt;] .......... add new submodule to current project
git clone --recursive &lt;url&gt; ............... clone project and recursively all
submodules (same as using
@@ -235,12 +236,12 @@
origin/HEAD or a branch specified
for the submodule
</code></pre>
-<h2><a class="header" href="#inspection" id="inspection">inspection</a></h2>
+<h2><a class="header" href="#inspection" id="inspection">Inspection</a></h2>
<pre><code class="language-markdown"> git ls-tree [-r] &lt;ref&gt; .... show git tree for &lt;ref&gt;, -r to recursively ls sub-trees
git show &lt;obj&gt; ............ show &lt;obj&gt;
git cat-file -p &lt;obj&gt; ..... print content of &lt;obj&gt;
</code></pre>
-<h2><a class="header" href="#revision_range" id="revision_range">revision_range</a></h2>
+<h2><a class="header" href="#revision-specifier" id="revision-specifier">Revision Specifier</a></h2>
<pre><code class="language-markdown"> HEAD ........ last commit
HEAD~1 ...... last commit-1
HEAD~N ...... last commit-N (linear backwards when in tree structure, check
@@ -259,7 +260,7 @@
- <a rel="next" href="gdb.html" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+ <a rel="next" href="awk.html" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
<i class="fa fa-angle-right"></i>
</a>
@@ -277,7 +278,7 @@
- <a href="gdb.html" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+ <a href="awk.html" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
<i class="fa fa-angle-right"></i>
</a>