https://www.hascode.com/tags/ignore/ Recent content in Ignore on Micha Kops' Tech Notes Hugo en Copyright © 2010 - 2025 Micha Kops. #e9d956c0c0154a221ad83c925346a8fa0e72f866 Mon, 01 Mar 2010 00:00:00 +0100 https://www.hascode.com/git-snippets/ Mon, 01 Mar 2010 00:00:00 +0100 https://www.hascode.com/git-snippets/ <div class="sect1"> <h2 id="_show_commits_from_another_branch_not_contained_in_current_branch">Show commits from another branch not contained in current branch</h2> <div class="sectionbody"> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-bash" data-lang="bash">git cherry -v otherbranch + f7d6a569bb6912aac97fce9ac92c4302863fb0d9 thecommit</code></pre> </div> </div> </div> </div> <div class="sect1"> <h2 id="_find_deleted_files">Find deleted files</h2> <div class="sectionbody"> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-bash" data-lang="bash">git log --diff-filter=D --summary</code></pre> </div> </div> </div> </div> <div class="sect1"> <h2 id="_create_empty_commit">Create empty commit</h2> <div class="sectionbody"> <div class="paragraph"> <p>sometimes necessary for build/deploy pipelines …​</p> </div> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-bash" data-lang="bash">git commit --allow-empty -m &#34;Empty-Commit&#34;</code></pre> </div> </div> </div> </div> <div class="sect1"> <h2 id="_cherry_pick_without_commit">Cherry pick without commit</h2> <div class="sectionbody"> <div class="listingblock"> <div class="content"> <pre class="highlight"><code class="language-bash" data-lang="bash">git cherry-pick -n HASH</code></pre> </div> </div> </div> </div> <div class="sect1"> <h2 id="_using_vimdiff_for_diff">Using vimdiff for diff</h2> <div class="sectionbody"> <div class="listingblock"> <div class="title">set it via git config</div> <div class="content"> <pre class="highlight"><code class="language-bash" data-lang="bash">git config --global diff.tool vimdiff git config --global merge.tool vimdiff</code></pre> </div> </div> <div class="listingblock"> <div class="title">set it via ~/.gitconfig</div> <div class="content"> <pre class="highlight"><code>[diff] tool = vimdiff [merge] tool = vimdiff</code></pre> </div>