knowledge
/
git-tips
mirror of https://github.com/namibia/tips.git
1
0
Fork 0
Code Issues Releases Activity

Merge pull request #73 from David-Wobrock/master 

Formatting tabs into spaces and adding tip of tracing changes to one file
This commit is contained in:
hemanth.hm 2016-06-09 12:05:40 +05:30
parent f9a314af96 cc2f616e56
commit 7ed587483e
2 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@ -107,6 +107,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
* [List all branch is WIP](#list-all-branch-is-wip)
* [Find guilty with binary search](#find-guilty-with-binary-search)
* [Bypass pre-commit and commit-msg githooks](#bypass-pre-commit-and-commit-msg-githooks)
* [List commits and changes to a specific file (even through renaming)](#list-commits-and-changes-to-a-specific-file-even-through-renaming)
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end toc -->
@ -706,14 +707,14 @@ git checkout master && git branch --no-merged
```
## Find guilty with binary search
```sh
git bisect start # Search start
git bisect bad # Set point to bad commit
git bisect good v2.6.13-rc2 # Set point to good commit|tag
git bisect bad # Say current state is bad
git bisect good # Say current state is good
git bisect reset # Finish search
git bisect start # Search start
git bisect bad # Set point to bad commit
git bisect good v2.6.13-rc2 # Set point to good commit|tag
git bisect bad # Say current state is bad
git bisect good # Say current state is good
git bisect reset # Finish search
```
## Bypass pre-commit and commit-msg githooks
@ -721,5 +722,10 @@ git bisect reset # Finish search
git commit --no-verify
```
## List commits and changes to a specific file (even through renaming)
```sh
git log --follow -p -- <file_path>
```
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end -->

56
tips.json
View File

@ -277,7 +277,7 @@
"tip": "git log Branch1 ^Branch2"
}, {
"title": "reuse recorded resolution, record and reuse previous conflicts resolutions.",
"tip":"git config --global rerere.enabled 1"
"tip": "git config --global rerere.enabled 1"
}, {
"title": "Open all conflicted files in an editor.",
"tip": "git diff --name-only | uniq | xargs $EDITOR"
@ -285,40 +285,42 @@
"title": "Count unpacked number of objects and their disk consumption.",
"tip": "git count-objects --human-readable"
}, {
"title": "Prune all unreachable objects from the object database.",
"tip": "git gc --prune=now --aggressive"
},{
"title": "Instantly browse your working repository in gitweb.",
"tip": "git instaweb [--local] [--httpd=<httpd>] [--port=<port>] [--browser=<browser>]"
},{
"title": "View the GPG signatures in the commit log",
"tip": "git log --show-signature"
"title": "Prune all unreachable objects from the object database.",
"tip": "git gc --prune=now --aggressive"
}, {
"title": "Instantly browse your working repository in gitweb.",
"tip": "git instaweb [--local] [--httpd=<httpd>] [--port=<port>] [--browser=<browser>]"
}, {
"title": "View the GPG signatures in the commit log",
"tip": "git log --show-signature"
}, {
"title": "Remove entry in the global config.",
"tip": "git config --global --unset <entry-name>"
},{
}, {
"title": "Checkout a new branch without any history",
"tip": "git checkout --orphan <branch_name>"
},{
"title": "File diff between staging and the last file version.",
"tip": "git diff --staged"
},{
"title": "Extract file from another branch.",
"tip": "git show <branch_name>:<file_name>"
}, {
"title": "List only the root and merge commits.",
"tip": "git log --first-parent"
"title": "File diff between staging and the last file version.",
"tip": "git diff --staged"
}, {
"title": "Merge previous two commits into one.",
"tip": "git rebase --interactive HEAD~2"
"title": "Extract file from another branch.",
"tip": "git show <branch_name>:<file_name>"
}, {
"title": "List all branch is WIP",
"tip": "git checkout master && git branch --no-merged"
"title": "List only the root and merge commits.",
"tip": "git log --first-parent"
}, {
"title": "Merge previous two commits into one.",
"tip": "git rebase --interactive HEAD~2"
}, {
"title": "List all branch is WIP",
"tip": "git checkout master && git branch --no-merged"
}, {
"title": "Find guilty with binary search",
"tip": "git bisect start # Search start \ngit bisect bad # Set point to bad commit \ngit bisect good v2.6.13-rc2 # Set point to good commit|tag \ngit bisect bad # Say current state is bad \ngit bisect good # Say current state is good \ngit bisect reset # Finish search \n"
}, {
"title": "Find guilty with binary search",
"tip": "git bisect start # Search start \ngit bisect bad # Set point to bad commit \ngit bisect good v2.6.13-rc2 # Set point to good commit|tag \ngit bisect bad # Say current state is bad \ngit bisect good # Say current state is good \ngit bisect reset # Finish search \n"
},
{
"title": "Bypass pre-commit and commit-msg githooks",
"tip": "git commit --no-verify"
}]
}, {
"title": "List commits and changes to a specific file (even through renaming)",
"tip": "git log --follow -p -- <file_path>"
}]