1
0
mirror of https://github.com/namibia/tips.git synced 2024-12-23 02:28:58 +00:00

Formatting tabs into spaces.

Doxie throws errors like '[doxie] Invalid JSON input: "Unexpected token	 in JSON at position 11987"' otherwise
This commit is contained in:
David-Wobrock 2016-06-08 22:00:17 +02:00
parent 9f5a85580a
commit c49409830a
2 changed files with 32 additions and 33 deletions

View File

@ -706,14 +706,14 @@ git checkout master && git branch --no-merged
``` ```
## Find guilty with binary search ## Find guilty with binary search
```sh ```sh
git bisect start # Search start git bisect start # Search start
git bisect bad # Set point to bad commit git bisect bad # Set point to bad commit
git bisect good v2.6.13-rc2 # Set point to good commit|tag git bisect good v2.6.13-rc2 # Set point to good commit|tag
git bisect bad # Say current state is bad git bisect bad # Say current state is bad
git bisect good # Say current state is good git bisect good # Say current state is good
git bisect reset # Finish search git bisect reset # Finish search
``` ```
## Bypass pre-commit and commit-msg githooks ## Bypass pre-commit and commit-msg githooks

View File

@ -285,40 +285,39 @@
"title": "Count unpacked number of objects and their disk consumption.", "title": "Count unpacked number of objects and their disk consumption.",
"tip": "git count-objects --human-readable" "tip": "git count-objects --human-readable"
}, { }, {
"title": "Prune all unreachable objects from the object database.", "title": "Prune all unreachable objects from the object database.",
"tip": "git gc --prune=now --aggressive" "tip": "git gc --prune=now --aggressive"
},{ }, {
"title": "Instantly browse your working repository in gitweb.", "title": "Instantly browse your working repository in gitweb.",
"tip": "git instaweb [--local] [--httpd=<httpd>] [--port=<port>] [--browser=<browser>]" "tip": "git instaweb [--local] [--httpd=<httpd>] [--port=<port>] [--browser=<browser>]"
},{ }, {
"title": "View the GPG signatures in the commit log", "title": "View the GPG signatures in the commit log",
"tip": "git log --show-signature" "tip": "git log --show-signature"
}, { }, {
"title": "Remove entry in the global config.", "title": "Remove entry in the global config.",
"tip": "git config --global --unset <entry-name>" "tip": "git config --global --unset <entry-name>"
},{ }, {
"title": "Checkout a new branch without any history", "title": "Checkout a new branch without any history",
"tip": "git checkout --orphan <branch_name>" "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.", "title": "File diff between staging and the last file version.",
"tip": "git log --first-parent" "tip": "git diff --staged"
}, { }, {
"title": "Merge previous two commits into one.", "title": "Extract file from another branch.",
"tip": "git rebase --interactive HEAD~2" "tip": "git show <branch_name>:<file_name>"
}, { }, {
"title": "List all branch is WIP", "title": "List only the root and merge commits.",
"tip": "git checkout master && git branch --no-merged" "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", "title": "Bypass pre-commit and commit-msg githooks",
"tip": "git commit --no-verify" "tip": "git commit --no-verify"
}] }]