274 lines
7.7 KiB
HTML
274 lines
7.7 KiB
HTML
<!doctype html>
|
|
<html lang='en' class='no-js '>
|
|
<head>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<meta charset='utf-8'>
|
|
<meta content='width=device-width, initial-scale=1.0' name='viewport'>
|
|
<link href='./assets/favicon.png' rel='shortcut icon'>
|
|
<meta content='/git-extras.html' name='app:pageurl'>
|
|
|
|
|
|
<title>Git extras cheatsheet</title>
|
|
<meta content='Git extras cheatsheet' property='og:title'>
|
|
<meta content='Git extras cheatsheet' property='twitter:title'>
|
|
<meta content='article' property='og:type'>
|
|
|
|
|
|
|
|
<meta content='https://assets.devhints.io/previews/git-extras.jpg?t=20200623143953' property='og:image'>
|
|
<meta content='https://assets.devhints.io/previews/git-extras.jpg?t=20200623143953' property='twitter:image'>
|
|
<meta content='900' property='og:image:width'>
|
|
<meta content='471' property='og:image:height'>
|
|
|
|
|
|
|
|
<meta content="The one-page guide to Git extras: usage, examples, links, snippets, and more." name="description">
|
|
<meta content="The one-page guide to Git extras: usage, examples, links, snippets, and more." property="og:description">
|
|
<meta content="The one-page guide to Git extras: usage, examples, links, snippets, and more." property="twitter:description">
|
|
|
|
|
|
<link rel="canonical" href="https://devhints.io/git-extras">
|
|
<meta name="og:url" content="https://devhints.io/git-extras">
|
|
|
|
|
|
|
|
|
|
|
|
<meta content='Devhints.io cheatsheets' property='og:site_name'>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<meta content='Git' property='article:section'>
|
|
|
|
|
|
|
|
|
|
|
|
<script async src='https://www.googletagmanager.com/gtag/js?id=UA-106902774-1'></script>
|
|
<script>
|
|
|
|
window.dataLayer=window.dataLayer||[];
|
|
function gtag(){dataLayer.push(arguments)};
|
|
gtag('js',new Date());
|
|
gtag('config','UA-106902774-1');
|
|
</script>
|
|
|
|
|
|
|
|
<meta property='page:depth' content='1'>
|
|
|
|
|
|
<script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
|
|
<script>(function(H){H.className=H.className.replace(/\bNoJs\b/,'WithJs')})(document.documentElement)</script>
|
|
|
|
<script>(function(d,s){if(window.Promise&&[].includes&&Object.assign&&window.Map)return;var js,sc=d.getElementsByTagName(s)[0];js=d.createElement(s);js.src='https://cdn.polyfill.io/v2/polyfill.min.js';sc.parentNode.insertBefore(js, sc);}(document,'script'))</script>
|
|
|
|
<!--[if lt IE 9]><script src='https://cdnjs.cloudflare.com/ajax/libs/nwmatcher/1.2.5/nwmatcher.min.js'></script><script src='https://cdnjs.cloudflare.com/ajax/libs/json2/20140204/json2.js'></script><script src='https://cdn.rawgit.com/gisu/selectivizr/1.0.3/selectivizr.js'></script><script src='https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js'></script><script src='https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js'></script><![endif]-->
|
|
|
|
<style>html{opacity:0}</style>
|
|
<link rel="stylesheet" href="./assets/2015/style.css?t=20200623143953">
|
|
<link href="./assets/style.css?t=20200623143953" rel="stylesheet" />
|
|
<link href="./assets/print.css?t=20200623143953" rel="stylesheet" media="print" />
|
|
</head>
|
|
<body>
|
|
<div class='all'>
|
|
|
|
<div class='site-header'>
|
|
<div class='container'>
|
|
This is <a href="."><em>Devhints.io cheatsheets</em></a> — a collection of cheatsheets I've written.
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<script type='application/ld+json'>
|
|
{
|
|
"@context": "http://schema.org",
|
|
"@type": "NewsArticle",
|
|
"mainEntityOfPage": {
|
|
"@type": "WebPage",
|
|
"@id": "https://google.com/article"
|
|
},
|
|
"headline": "Git extras cheatsheet",
|
|
"image": [ "https://assets.devhints.io/previews/git-extras.jpg?t=20200623143953" ],
|
|
"description": "The one-page guide to Git extras: usage, examples, links, snippets, and more."
|
|
}
|
|
</script>
|
|
<script type='application/ld+json'>
|
|
{
|
|
"@context": "http://schema.org",
|
|
"@type": "BreadcrumbList",
|
|
"itemListElement": [{
|
|
"@type": "ListItem",
|
|
"position": 1,
|
|
"item": {
|
|
"@id": "https://devhints.io/#git",
|
|
"name": "Git"
|
|
}
|
|
},{
|
|
"@type": "ListItem",
|
|
"position": 2,
|
|
"item": {
|
|
"@id": "https://devhints.io/git-extras",
|
|
"name": "Git extras"
|
|
}
|
|
}]
|
|
}
|
|
</script>
|
|
|
|
|
|
<div class='post-list -single -cheatsheet'>
|
|
<div class='post-item'>
|
|
<div class='post-headline -cheatsheet'>
|
|
<p class='prelude'><span></span></p>
|
|
<h1><span>Git extras</span></h1>
|
|
|
|
<ul class="social-list ">
|
|
<li class="facebook link hint--bottom" data-hint="Share on Facebook"><a href="https://www.facebook.com/sharer/sharer.php?u=https://devhints.io/git-extras.html" target="share"><span class="text"></span></a></li>
|
|
<li class="twitter link hint--bottom" data-hint="Share on Twitter"><a href="https://twitter.com/intent/tweet?text=The%20ultimate%20cheatsheet%20for%20Git%20extras.%20https://devhints.io/git-extras.html" target="share"><span class="text"></span></a></li>
|
|
|
|
</ul>
|
|
|
|
</div>
|
|
|
|
<div class='post-content -cheatsheet'>
|
|
<h3 id="git-flow">Git-flow</h3>
|
|
|
|
<pre><code>$ git feature myfeature
|
|
switched to branch 'feature/rofl'
|
|
|
|
$ ...
|
|
$ git checkout develop
|
|
$ git feature finish myfeature
|
|
merging 'feature/rofl' into develop
|
|
deleted branch 'feature/rofl'
|
|
</code></pre>
|
|
|
|
<p>Also <code>git-bug</code> and <code>git-refactor</code>.</p>
|
|
|
|
<h3 id="branches">Branches</h3>
|
|
|
|
<pre><code>$ git delete-merged-branches
|
|
# hint: do `git remote prune origin` after
|
|
|
|
$ git create-branch development
|
|
$ git delete-branch development
|
|
|
|
$ git fresh-branch gh-pages
|
|
</code></pre>
|
|
|
|
<h3 id="inspecting">Inspecting</h3>
|
|
|
|
<pre><code>$ git summary # repo age, commits, active days, etc
|
|
$ git impact # impact graph
|
|
$ git effort # commits per file
|
|
</code></pre>
|
|
|
|
<h3 id="github">Github</h3>
|
|
|
|
<pre><code>$ git fork strongloop/express
|
|
# sync your fork with the original repository:
|
|
$ git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git
|
|
$ git fetch upstream; git merge upstream/master
|
|
</code></pre>
|
|
|
|
<h3 id="tags">Tags</h3>
|
|
|
|
<pre><code>$ git release v1.0.0 # commit, tag, push-tags
|
|
$ git delete-tag v1.0.0
|
|
</code></pre>
|
|
|
|
<h3 id="conveniences">Conveniences</h3>
|
|
|
|
<pre><code>$ git ignore "*.log"
|
|
</code></pre>
|
|
|
|
<h3 id="locking">Locking</h3>
|
|
|
|
<p>Assumes that changes will not be committed.</p>
|
|
|
|
<pre><code>$ git lock config/database.yml
|
|
$ git unlock config/database.yml
|
|
</code></pre>
|
|
|
|
<h3 id="etc">Etc</h3>
|
|
|
|
<pre><code>$ git obliterate secret.yml # remove all references to it
|
|
</code></pre>
|
|
|
|
<h3 id="references">References</h3>
|
|
|
|
<ul>
|
|
<li>https://github.com/visionmedia/git-extras</li>
|
|
</ul>
|
|
|
|
</div>
|
|
|
|
|
|
<ul class="social-list ">
|
|
<li class="facebook link hint--bottom" data-hint="Share on Facebook"><a href="https://www.facebook.com/sharer/sharer.php?u=https://devhints.io/git-extras.html" target="share"><span class="text"></span></a></li>
|
|
<li class="twitter link hint--bottom" data-hint="Share on Twitter"><a href="https://twitter.com/intent/tweet?text=The%20ultimate%20cheatsheet%20for%20Git%20extras.%20https://devhints.io/git-extras.html" target="share"><span class="text"></span></a></li>
|
|
|
|
</ul>
|
|
|
|
</div>
|
|
</div>
|
|
|
|
<div class="about-the-site">
|
|
<div class="container">
|
|
<p class='blurb'>
|
|
<strong><a href=".">Devhints.io cheatsheets</a></strong> is a collection of cheatsheets I've written over the years.
|
|
Suggestions and corrections? <a href='https://github.com/rstacruz/cheatsheets/issues/907'>Send them in</a>.
|
|
<i class='fleuron'></i>
|
|
I'm <a href="http://ricostacruz.com">Rico Sta. Cruz</a>.
|
|
Check out my <a href="http://ricostacruz.com/til">Today I learned blog</a> for more.
|
|
</p>
|
|
|
|
|
|
<p class='back'>
|
|
<a class='big-button -back -slim' href='.#toc'></a>
|
|
</p>
|
|
|
|
|
|
<p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.5/highlight.min.js"></script>
|
|
|
|
|
|
|
|
|
|
<script src="https://cdn.rawgit.com/rstacruz/unorphan/v1.0.1/index.js"></script>
|
|
<script>hljs.initHighlightingOnLoad()</script>
|
|
<script>unorphan('h1, h2, h3, p, li, .unorphan')</script>
|
|
|
|
</body>
|
|
</html>
|
|
|