diff --git a/github-roam.md b/github-roam.md index 432bb97..c78ab7e 100644 --- a/github-roam.md +++ b/github-roam.md @@ -1887,7 +1887,7 @@ WTF！ Release --- -Git 工具推荐 +Git 与 GitHub 工具推荐 === 至于我的日常用的 Git 观看工具，一个是 WebStorm 和 Intellij IDEA 自带的，一个则是 SourceTree。 @@ -1896,6 +1896,132 @@ Git 工具推荐 而 SourceTree 则方便用来查看一些非我写的项目，寻找其中的一些问题。个中缘由便是：**Intelli IDEA 刚打开某个项目的时候，需要花费大量的时间 index**，只可惜现有的 SourceTree 客户端都需要登录 Atlassian 账户了。 +Git 命令行增强 +--- + +### [diff-so-fancy](https://github.com/so-fancy/diff-so-fancy) + +![diff so fancy 截图](git-diff-screenshot.png) + +### [git-extras](https://github.com/tj/git-extras) + +**Ubuntu** + +``` +$ sudo apt-get install git-extras +``` + +**Mac OS X with Homebrew** + +``` +$ brew install git-extras +``` + +``` +$ git-summary + + + project : github-roam + repo age : 2 years, 7 months + active : 40 days + commits : 124 + files : 101 + authors : + 72 Fengda HUANG 58.1% + 29 Fengda Huang 23.4% + 8 Phodal HUANG 6.5% + 3 Phodal Huang 2.4% + 2 yangpei3720 1.6% + 2 WangXiaolong 1.6% + 2 TZS 1.6% + 1 安正超 0.8% + 1 Li 0.8% + 1 Qiuer 0.8% + 1 SCaffrey 0.8% + 1 oncealong 0.8% + 1 zminds 0.8% +``` + +Intellij IDEA +--- + +Intellij IDEA + +Git、GitHub桌面增强 +--- + +### SourceTree + +gitflow 分支合并、查看 + +![SourceTree 截图](sourcetree.jpg) + +### GitHub Desktop + +![GitHub Desktop](github-desktop.jpg) + +Git 娱乐 +--- + +### githug + +``` +$ githug + +******************************************************************************** +* Githug * +******************************************************************************** +No githug directory found, do you wish to create one? [yn] y +Welcome to Githug! + +Name: init +Level: 1 +Difficulty: * + +A new directory, `git_hug`, has been created; initialize an empty repository in it. +``` + + +``` +$ githug play + +******************************************************************************** +* Githug * +******************************************************************************** +Congratulations, you have solved the level! + +Name: config +Level: 2 +Difficulty: * + +Set up your git name and email, this is important so that your commits can be identified. +``` + +``` +#1: init +#2: config +#3: add +#4: commit +#5: clone +#6: clone_to_folder +#7: ignore +#8: include +#9: status +#10: number_of_files_committed +#11: rm +#12: rm_cached +#13: stash +#14: rename +#15: restructure +#16: log +#17: tag +#... +``` + +### Gource + +![Gource 历史](gource.jpg) + # GitHub用户分析 ## 生成图表 diff --git a/index.html b/index.html index c2c5160..df4c988 100644 --- a/index.html +++ b/index.html @@ -169,7 +169,21 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
  • 开源项目维护
    • -
  • Git 工具推荐
    • +
  • Git 与 GitHub 工具推荐
  • GitHub用户分析