From 028da4a0c3527ecc463ec8bfc69757cc90c4a9f6 Mon Sep 17 00:00:00 2001 From: Aditya Harsh Date: Thu, 7 Jul 2016 19:12:54 +0530 Subject: [PATCH 001/108] Add tip to use common diff tools --- README.md | 6 ++++++ tips.json | 3 +++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 98ca3f2..8e15921 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Fetch pull request by ID to a local branch](#fetch-pull-request-by-id-to-a-local-branch) * [Show the most recent tag on the current branch.](#show-the-most-recent-tag-on-the-current-branch) * [Show inline word diff.](#show-inline-word-diff) +* [Show changes using common diff tools.](#show-changes-using-common-diff-tools) * [Don’t consider changes for tracked file.](#dont-consider-changes-for-tracked-file) * [Undo assume-unchanged.](#undo-assume-unchanged) * [Clean the files from `.gitignore`.](#clean-the-files-from-gitignore) @@ -634,6 +635,11 @@ git describe --tags --abbrev=0 git diff --word-diff ``` +## Show changes using common diff tools. +```sh +git difftool -t +``` + ## Don’t consider changes for tracked file. ```sh git update-index --assume-unchanged diff --git a/tips.json b/tips.json index 3c1bcab..d730120 100644 --- a/tips.json +++ b/tips.json @@ -238,6 +238,9 @@ }, { "title": "Show inline word diff.", "tip": "git diff --word-diff" +}, { + "title": "Show changes using common diff tools.", + "tip": "git difftool -t " }, { "title": "Don’t consider changes for tracked file.", "tip": "git update-index --assume-unchanged " From d764ab75165c3e4ac3d703d70093df7f9d9fec7a Mon Sep 17 00:00:00 2001 From: S N Munendra Date: Sat, 16 Jul 2016 13:33:32 +0530 Subject: [PATCH 002/108] Add git shortlog git shortlog summaries git log output. Each commit is grouped by authors and title. --- README.md | 6 ++++++ tips.json | 3 +++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 8e15921..7f80a6d 100644 --- a/README.md +++ b/README.md @@ -127,6 +127,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Force push to Remote Repository](#force-push-to-remote-repository) * [Adding Remote name](#adding-remote-name) * [Show the author, time and last revision made to each line of a given file](#show-the-author-time-and-last-revision-made-to-each-line-of-a-given-file) +* [Group commits by authors and title](#group-commits-by-authors-and-title) @@ -892,5 +893,10 @@ git remote add

git blame ``` +## Group commits by authors and title +```sh +git shortlog +``` + diff --git a/tips.json b/tips.json index d730120..ea1779b 100644 --- a/tips.json +++ b/tips.json @@ -386,4 +386,7 @@ }, { "title": "Show the author, time and last revision made to each line of a given file", "tip": "git blame " +}, { + "title": "Group commits by authors and title", + "tip": "git shortlog" }] From 89e9fa678c89989de364f76764f89459bcd1d7ca Mon Sep 17 00:00:00 2001 From: xueweihan <595666367@qq.com> Date: Sat, 23 Jul 2016 10:35:37 +0800 Subject: [PATCH 003/108] Import Chinese version --- README.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7f80a6d..b81459f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ ## git-tips > Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md) +[English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) + P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. @@ -353,7 +355,7 @@ git branch --contains ## Git Aliases ```sh -git config --global alias. +git config --global alias. git config --global alias.st status ``` @@ -517,7 +519,7 @@ __Alternatives:__ git branch -m [] ``` -## rebases 'feature' to 'master' and merges it in to master +## rebases 'feature' to 'master' and merges it in to master ```sh git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1} ``` @@ -798,12 +800,12 @@ 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 ``` From 3c17588d846e04cffcc94bf4c91d48dc426774fc Mon Sep 17 00:00:00 2001 From: nirajpandkar Date: Sun, 31 Jul 2016 18:22:27 +0530 Subject: [PATCH 004/108] Capitalized the first letter of certain words --- README.md | 34 +++++++++++++++++----------------- tips.json | 10 +++++----- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index b81459f..9ab3cf1 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Update all the submodules](#update-all-the-submodules) * [Show all commits in the current branch yet to be merged to master](#show-all-commits-in-the-current-branch-yet-to-be-merged-to-master) * [Rename a branch](#rename-a-branch) -* [rebases 'feature' to 'master' and merges it in to master ](#rebases-feature-to-master-and-merges-it-in-to-master) +* [Rebases 'feature' to 'master' and merges it in to master ](#rebases-feature-to-master-and-merges-it-in-to-master) * [Archive the `master` branch](#archive-the-master-branch) * [Modify previous commit without modifying the commit message](#modify-previous-commit-without-modifying-the-commit-message) * [Prunes references to remote branches that have been deleted in the remote.](#prunes-references-to-remote-branches-that-have-been-deleted-in-the-remote) @@ -94,13 +94,13 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Check if the change was a part of a release.](#check-if-the-change-was-a-part-of-a-release) * [Dry run. (any command that supports dry-run flag should do.)](#dry-run-any-command-that-supports-dry-run-flag-should-do) * [Marks your commit as a fix of a previous commit.](#marks-your-commit-as-a-fix-of-a-previous-commit) -* [squash fixup commits normal commits.](#squash-fixup-commits-normal-commits) -* [skip staging area during commit.](#skip-staging-area-during-commit) +* [Squash fixup commits normal commits.](#squash-fixup-commits-normal-commits) +* [Skip staging area during commit.](#skip-staging-area-during-commit) * [Interactive staging.](#interactive-staging) * [List ignored files.](#list-ignored-files) * [Status of ignored files.](#status-of-ignored-files) * [Commits in Branch1 that are not in Branch2](#commits-in-branch1-that-are-not-in-branch2) -* [reuse recorded resolution, record and reuse previous conflicts resolutions.](#reuse-recorded-resolution-record-and-reuse-previous-conflicts-resolutions) +* [Reuse recorded resolution, record and reuse previous conflicts resolutions.](#reuse-recorded-resolution-record-and-reuse-previous-conflicts-resolutions) * [Open all conflicted files in an editor.](#open-all-conflicted-files-in-an-editor) * [Count unpacked number of objects and their disk consumption.](#count-unpacked-number-of-objects-and-their-disk-consumption) * [Prune all unreachable objects from the object database.](#prune-all-unreachable-objects-from-the-object-database) @@ -119,7 +119,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Create and switch new branch](#create-and-switch-new-branch) * [Ignore file mode changes on commits](#ignore-file-mode-changes-on-commits) * [Turn off git colored terminal output](#turn-off-git-colored-terminal-output) -* [specific color settings](#specific-color-settings) +* [Specific color settings](#specific-color-settings) * [Show all local branches ordered by recent commits](#show-all-local-branches-ordered-by-recent-commits) * [Find lines matching the pattern (regex or string) in tracked files](#find-lines-matching-the-pattern-regex-or-string-in-tracked-files) * [Clone a shallow copy of a repository](#clone-a-shallow-copy-of-a-repository) @@ -355,7 +355,7 @@ git branch --contains ## Git Aliases ```sh -git config --global alias. +git config --global alias. git config --global alias.st status ``` @@ -519,7 +519,7 @@ __Alternatives:__ git branch -m [] ``` -## rebases 'feature' to 'master' and merges it in to master +## Rebases 'feature' to 'master' and merges it in to master ```sh git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1} ``` @@ -708,12 +708,12 @@ git clean -fd --dry-run git commit --fixup ``` -## squash fixup commits normal commits. +## Squash fixup commits normal commits. ```sh git rebase -i --autosquash ``` -## skip staging area during commit. +## Skip staging area during commit. ```sh git commit --only ``` @@ -738,7 +738,7 @@ git status --ignored git log Branch1 ^Branch2 ``` -## reuse recorded resolution, record and reuse previous conflicts resolutions. +## Reuse recorded resolution, record and reuse previous conflicts resolutions. ```sh git config --global rerere.enabled 1 ``` @@ -800,12 +800,12 @@ 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 ``` @@ -845,7 +845,7 @@ git config core.fileMode false git config --global color.ui false ``` -## specific color settings +## Specific color settings ```sh git config --global ``` diff --git a/tips.json b/tips.json index ea1779b..08550e3 100644 --- a/tips.json +++ b/tips.json @@ -183,7 +183,7 @@ "tip": "git branch -m ", "alternatives": ["git branch -m [] "] }, { - "title": "rebases 'feature' to 'master' and merges it in to master ", + "title": "Rebases 'feature' to 'master' and merges it in to master ", "tip": "git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1}" }, { "title": "Archive the `master` branch", @@ -281,10 +281,10 @@ "title": "Marks your commit as a fix of a previous commit.", "tip": "git commit --fixup " }, { - "title": "squash fixup commits normal commits.", + "title": "Squash fixup commits normal commits.", "tip": "git rebase -i --autosquash" }, { - "title": "skip staging area during commit.", + "title": "Skip staging area during commit.", "tip": "git commit --only " }, { "title": "Interactive staging.", @@ -299,7 +299,7 @@ "title": "Commits in Branch1 that are not in Branch2", "tip": "git log Branch1 ^Branch2" }, { - "title": "reuse recorded resolution, record and reuse previous conflicts resolutions.", + "title": "Reuse recorded resolution, record and reuse previous conflicts resolutions.", "tip": "git config --global rerere.enabled 1" }, { "title": "Open all conflicted files in an editor.", @@ -357,7 +357,7 @@ "title": "Turn off git colored terminal output", "tip": "git config --global color.ui false" },{ - "title": "specific color settings", + "title": "Specific color settings", "tip": "git config --global " },{ "title": "Show all local branches ordered by recent commits", From 275ff62454faa748931627b9b128f9b5c0600e10 Mon Sep 17 00:00:00 2001 From: nirajpandkar Date: Wed, 10 Aug 2016 22:02:02 +0530 Subject: [PATCH 005/108] added gtip CLI link --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9ab3cf1..76a4fab 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ [English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) +[gtip](https://github.com/nirajpandkar/gtip) - A handy CLI to make optimum use of these tips. + P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. From 7c9f3c88c579d8bdba6b6c9363c75477b2b268cb Mon Sep 17 00:00:00 2001 From: weirdpattern Date: Wed, 10 Aug 2016 13:08:56 -0500 Subject: [PATCH 006/108] git push --force-with-lease tip --- README.md | 6 ++++++ tips.json | 3 +++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 9ab3cf1..2ca8f50 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Adding Remote name](#adding-remote-name) * [Show the author, time and last revision made to each line of a given file](#show-the-author-time-and-last-revision-made-to-each-line-of-a-given-file) * [Group commits by authors and title](#group-commits-by-authors-and-title) +* [Forced push but still ensure you don't overwrite other's work](#forced-push-but-still-ensure-you-dont-overwrite-others-work) @@ -900,5 +901,10 @@ git blame git shortlog ``` +## Forced push but still ensure you don't overwrite other's work +```sh +git push --force-with-lease

+``` + diff --git a/tips.json b/tips.json index 08550e3..75dd558 100644 --- a/tips.json +++ b/tips.json @@ -389,4 +389,7 @@ }, { "title": "Group commits by authors and title", "tip": "git shortlog" +}, { + "title": "Forced push but still ensure you don't overwrite other's work", + "tip": "git push --force-with-lease

" }] From 19e49a97e1f2fe28320cf6d79c0f40d9f7292088 Mon Sep 17 00:00:00 2001 From: nirajpandkar Date: Thu, 11 Aug 2016 11:25:16 +0530 Subject: [PATCH 007/108] changed the name of the module --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76a4fab..69ae8e2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) -[gtip](https://github.com/nirajpandkar/gtip) - A handy CLI to make optimum use of these tips. +[git-tip](https://www.npmjs.com/package/git-tip) - A handy CLI to make optimum use of these tips. P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. From 4f94e6733eb86af05f78b9d7c30839aca21b223e Mon Sep 17 00:00:00 2001 From: nirajpandkar Date: Thu, 11 Aug 2016 11:41:59 +0530 Subject: [PATCH 008/108] added Tools subcategory --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 69ae8e2..1e58e8e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,9 @@ [English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) -[git-tip](https://www.npmjs.com/package/git-tip) - A handy CLI to make optimum use of these tips. +### Tools + +* [git-tip](https://www.npmjs.com/package/git-tip) - A handy CLI to make optimum use of these tips. P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. From debac552398de728b5689c841a623e9d640bb20e Mon Sep 17 00:00:00 2001 From: nirajpandkar Date: Thu, 11 Aug 2016 12:05:19 +0530 Subject: [PATCH 009/108] format changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e58e8e..6f4dace 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) -### Tools +### __Tools:__ * [git-tip](https://www.npmjs.com/package/git-tip) - A handy CLI to make optimum use of these tips. From bfb1379951634c73183368f28eec5670d1ae3dc7 Mon Sep 17 00:00:00 2001 From: Changlang Kuang Date: Fri, 12 Aug 2016 19:04:12 +0800 Subject: [PATCH 010/108] add: Show how many lines does an author contribute (#121) --- README.md | 14 ++++++++++++++ tips.json | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/README.md b/README.md index c3c31a8..fcf5404 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Show the author, time and last revision made to each line of a given file](#show-the-author-time-and-last-revision-made-to-each-line-of-a-given-file) * [Group commits by authors and title](#group-commits-by-authors-and-title) * [Forced push but still ensure you don't overwrite other's work](#forced-push-but-still-ensure-you-dont-overwrite-others-work) +* [Show how many lines does an author contribute](#show-how-many-lines-does-an-author-contribute) @@ -910,5 +911,18 @@ git shortlog git push --force-with-lease

``` +## Show how many lines does an author contribute +```sh +git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | gawk '{ add += ; subs += ; loc += - } END { printf "added lines: %s removed lines: %s total lines: %s +", add, subs, loc }' - +``` + + +__Alternatives:__ +```sh +git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | awk '{ add += ; subs += ; loc += - } END { printf "added lines: %s, removed lines: %s, total lines: %s +", add, subs, loc }' - # on Mac OSX +``` + diff --git a/tips.json b/tips.json index 75dd558..85c762d 100644 --- a/tips.json +++ b/tips.json @@ -392,4 +392,8 @@ }, { "title": "Forced push but still ensure you don't overwrite other's work", "tip": "git push --force-with-lease