--- title: Git Tips 1: Oldies but Goodies | daily.dev description: A collection of lesser-known but long-standing Git features worth knowing: conditional git configs using includeIf (gitdir, onbranch, hasconfig), git blame and... canonical: https://daily.dev/posts/git-tips-1-oldies-but-goodies-bp9zmcy2f twitter:card: summary_large_image twitter:site: @dailydotdev og:type: website og:site_name: daily.dev og:title: Git Tips 1: Oldies but Goodies | daily.dev og:description: A collection of lesser-known but long-standing Git features worth knowing: conditional git configs using includeIf (gitdir, onbranch, hasconfig), git blame and... og:url: https://daily.dev/posts/git-tips-1-oldies-but-goodies-bp9zmcy2f og:image: https://api.daily.dev/og/posts/BP9ZmcY2f.png og:image:alt: Git Tips 1: Oldies but Goodies og:image:width: 1200 og:image:height: 630 og:locale: en --- > ## Documentation Index > Fetch the complete documentation index at: https://daily.dev/llms.txt > Use this file to discover all available pages before exploring further. # Git Tips 1: Oldies but Goodies **[GitButler Blog](https://daily.dev/sources/gitbutler)** · 6 min read · 0 upvotes · 0 comments ## Summary A collection of lesser-known but long-standing Git features worth knowing: conditional git configs using includeIf (gitdir, onbranch, hasconfig), git blame and log with line ranges (-L flag), git blame with code-movement following (-C flag, up to three times) and whitespace ignoring (-w), word-level diffs with --word-diff, and automatic merge conflict resolution reuse via rerere.enabled and rerere.autoUpdate. These CLI features are often missing from GUI tools and can significantly improve how developers trace code history and manage conflicts. ## Full article daily.dev links to this article rather than hosting it. Read it at the original source: --- Tags: [#devtools](https://daily.dev/tags/devtools), [#git](https://daily.dev/tags/git), [#version-control](https://daily.dev/tags/version-control) [View this post on daily.dev](https://daily.dev/posts/git-tips-1-oldies-but-goodies-bp9zmcy2f) ```json {"@context":"https://schema.org","@graph":[{"@type":"Organization","@id":"https://daily.dev/#organization","name":"daily.dev","url":"https://daily.dev","logo":{"@type":"ImageObject","url":"https://daily.dev/apple-touch-icon.png","width":180,"height":180},"sameAs":["https://twitter.com/dailydotdev","https://github.com/dailydotdev","https://www.linkedin.com/company/daily-dev-ltd"]},{"@type":"WebSite","@id":"https://daily.dev/#website","url":"https://daily.dev","name":"daily.dev","publisher":{"@id":"https://daily.dev/#organization"},"potentialAction":{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https://daily.dev/search?q={search_term_string}"},"query-input":"required name=search_term_string"}}]} {"@context":"https://schema.org","@type":"TechArticle","headline":"Git Tips 1: Oldies but Goodies","url":"https://daily.dev/posts/git-tips-1-oldies-but-goodies-bp9zmcy2f","mainEntityOfPage":{"@type":"WebPage","@id":"https://daily.dev/posts/git-tips-1-oldies-but-goodies-bp9zmcy2f"},"datePublished":"2026-07-26T07:48:16.563Z","dateModified":"2026-07-26T07:48:37.182Z","description":"A collection of lesser-known but long-standing Git features worth knowing: conditional git configs using includeIf (gitdir, onbranch, hasconfig), git blame and...","image":"https://media.daily.dev/image/upload/f_auto,q_auto/v1/posts/5b60bf1f8c2f0dd0a3ba2c67e5fcb386?_a=AQAEuop","thumbnailUrl":"https://media.daily.dev/image/upload/f_auto,q_auto/v1/posts/5b60bf1f8c2f0dd0a3ba2c67e5fcb386?_a=AQAEuop","isAccessibleForFree":true,"articleSection":"GitButler Blog","inLanguage":"en","publisher":{"@type":"Organization","name":"daily.dev","url":"https://daily.dev","logo":{"@type":"ImageObject","url":"https://daily.dev/apple-touch-icon.png","width":180,"height":180}},"author":{"@type":"Organization","name":"GitButler Blog","logo":"https://media.daily.dev/image/upload/s--LrHsyt2T--/f_auto/v1692632054/squad_placeholder_sfwkmj","url":"https://daily.dev/sources/gitbutler"},"commentCount":0,"discussionUrl":"https://daily.dev/posts/git-tips-1-oldies-but-goodies-bp9zmcy2f","interactionStatistic":[{"@type":"InteractionCounter","interactionType":{"@type":"LikeAction"},"userInteractionCount":0},{"@type":"InteractionCounter","interactionType":{"@type":"CommentAction"},"userInteractionCount":0}],"keywords":"devtools,git,version-control","timeRequired":"PT6M"} {"@context":"https://schema.org","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https://daily.dev"},{"@type":"ListItem","position":2,"name":"GitButler Blog","item":"https://daily.dev/sources/gitbutler"},{"@type":"ListItem","position":3,"name":"Git Tips 1: Oldies but Goodies"}]} ```