學習筆記之Git / Gitflow / TortoiseGit

Git - Wikipedia

• https://en.wikipedia.org/wiki/Git
• Git (/ɡɪt/) is a version control system for tracking changes in computer files and coordinating work on those files among multiple people. It is primarily used for source code management in software development, but it can be used to keep track of changes in any set of files. As a distributed revision control system it is aimed at speed, data integrity, and support for distributed, non-linear workflows.

Gitflow Workflow | Atlassian Git Tutorial

• https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
• Gitflow Workflow is a Git workflow design that was first published and made popular by Vincent Driessen at nvie. The Gitflow Workflow defines a strict branching model designed around the project release. This provides a robust framework for managing larger projects. 

Pull Requests and Gitflow

• https://blog.axosoft.com/pull-requests-gitflow/?utm_campaign=GitKraken%20Promos&utm_medium=email&_hsenc=p2ANqtz--5kZ-hsMZwcIFWuqofU-Oa0iqSOfNS72XNKNaK7CpgtDt6A865oAJYYgDGwDy9KV3_VBTX1DzFJun_PtkOHa1HRm5ptQ&_hsmi=61804615&utm_content=61804282&utm_source=hs_email&hsCtaTracking=61c5ea4a-e8bd-4ffd-bdfa-7de19a1b53e1%7Cfba6e886-1dff-473b-8c6b-f5a02ebef2c2
• In my previous post, I discussed the Gitflow model and how it helps enterprises manage releases. In this post, I will be discussing pull requests and their importance in the development process.

TortoiseGit – Windows Shell Interface to Git

• https://tortoisegit.org/
• TortoiseGit provides overlay icons showing the file status, a powerful context menu for Git and much more!

TortoiseGit - Wikipedia

• https://en.wikipedia.org/wiki/TortoiseGit
• TortoiseGit is a Git revision control client, implemented as a Windows shell extension and based on TortoiseSVN. It is free software released under the GNU General Public License.
• In Windows Explorer, besides showing context menu items for Git commands, TortoiseGit provides icon overlays that indicate the status of Git working trees and files.
• It also comes with the TortoiseGitMerge utility to visually compare two files and resolve conflicts.

TortoiseGit - 維基百科，自由的百科全書

• https://zh.wikipedia.org/wiki/TortoiseGit
• TortoiseGit是一個Git版本控制客戶端，做爲Microsoft Windows的外殼擴展實現。它在GNU通用公共許可協議下做爲自由軟件發佈。

---

Git 教程 | 菜鳥教程

• http://www.runoob.com/git/git-tutorial.html

如何優雅地向別人介紹Git - 機器之心

• https://mp.weixin.qq.com/s/79Aug3YQzS5-IuJlg46ukg
• 本文主題是如何向工具初學者介紹分佈式版本控制系統 Git。除了瞭解關於 Git 的基本知識之外，你們還能夠學到一些工具學習方面的東西。
• https://rachelcarmena.github.io/2018/12/12/how-to-teach-git.html

一篇文章，教你學會Git

• https://mp.weixin.qq.com/s/O93vtQEAc3ULwHSuyU8RzA
• https://www.jianshu.com/p/072587b47515
• 1、Git工做流程
• 2、經常使用Git命令

Git入門

• https://mp.weixin.qq.com/s/kreK2FlQ31VP2303FbpQzQ

• 版本控制介紹

  • 什麼是版本控制

  • 爲何要版本控制

  • 本地版本控制系統

  • 集中化的版本控制系統

  • 分佈式版本控制系統

• 認識 Git
  • Git 簡史
  • Git 與其餘版本管理系統的主要區別
  • Git 的三種狀態
• Git 使用快速入門
  • 獲取 Git 倉庫
  • 記錄每次更新到倉庫
  • 推送改動到遠程倉庫
  • 遠程倉庫的移除與重命名
  • 查看提交歷史
  • 撤銷操做
  • 分支
• 推薦閱讀

20 分鐘教你搞懂 Git！- 機器學習算法與Python學習

• https://mp.weixin.qq.com/s/pyThc93faTz0N1gmHybFxw
• 1. 初始化
• 2. 保存對象
• 3. 更新索引
• 4. git add命令
• 5. 提交（Commit）
• 6. 完成提交
• 7. git commit命令
• 8. 分支（branch）
• 9. 更新分支

git 版本控制初學者指南

• https://mp.weixin.qq.com/s/PAF365YSP-EOOlz6AzFkXA

git 操做規範 - 程序猿

• https://mp.weixin.qq.com/s/gshJ7HeHVCnUjTssJYeSSw
• https://segmentfault.com/a/1190000014461898
• 1、 建立與合併分支
• 2、 解決衝突
• 3、Bug分支
• 4、版本回退
• 5、撤銷修改
• 6、對於已經push的版本，進行回退
• 7、本地同步遠程刪除的分支
• 8、刪除掉沒有與遠程分支對應的本地分支
• 9、查看遠程庫的一些信息，及與本地分支的信息
• 10、git stash臨時保存本地操做

你可能會忽略的 Git 提交規範 - Linux學習

• https://mp.weixin.qq.com/s/alHVVwRQ1Cu9vb3vOqSNgQ
• http://jartto.wang/2018/07/08/git-commit/

---

BEST PRACTICE

Git 12 歲了，爲你送上 12 個 Git 的使用技巧！ - Linux學習

• https://mp.weixin.qq.com/s/JZGmwYGp9ZGjYJfTu7SVJQ
• https://www.oschina.net/translate/12-git-tips-gits-12th-birthday
• 1. 你的 ~/.gitconfig 文件
• 2. 你的倉庫的.gitconfig文件
• 三、別名
• 4. shell命令中的別名
• 5. 可視化提交圖
• 6. 更優雅的強制推送(force-push)
• 7. git add -N
• 8. git add -p
• 9. git checkout -p
• 10. Rebase with command execution
• 11. 基於時間修改的指南
• 12. 全知的 reflog

10種Git技巧，讓你省時省力又省心！

• https://mp.weixin.qq.com/s?__biz=MzIxODM4MjA5MA==&mid=2247490747&idx=1&sn=659415dda67813229d9e22ea6f3feb3a&chksm=97ea36dea09dbfc8403ac08354fc2e424d129535514b3d5e5437cf09066b32967ef0221f43bb&mpshare=1&scene=24&srcid=&sharer_sharetime=1567921736480&sharer_shareid=5ed4a849fa42d9599a974fa8eb45e8fa&key=5a37b8e9f2933463edafcb746a6bb5f5b98d6bcf34bfab0e92617ea276b27583fd9174edd408a53d07c8d1153ad57172c3953e572d1828a5f393ba9ef49571900ad79539ef29f6bbbe1a03beeb200e71&ascene=14&uin=MTMzMzc3MjY4MQ%3D%3D&devicetype=Windows+10&version=62060833&lang=en&pass_ticket=tT3maEfznKd3xtVT4L8%2Bl%2B2KKdhrJZ3ERaWEoIpqIMB2I2ssKo%2BTfx0v80L7rMTL

你可能不太會用的10個Git命令 - 機器之心

• https://mp.weixin.qq.com/s/2K8coqrcCajUtzx67jlZYg

團隊開發中的 Git 實踐

• https://mp.weixin.qq.com/s/Jo8Z7EqNUiQD9VSOKXQUKQ
• https://ourai.ws/posts/working-with-git-in-team/

這有一份 Git 平常使用清單

• https://mp.weixin.qq.com/s/DtHfpMy5O6pGzP40m4HJ3Q
• http://www.javashuo.com/article/p-pmwzhqxi-bs.html

Learn Git: Merging vs Rebasing

• https://blog.axosoft.com/learn-git-merging-rebasing/
• In this quick Git tutorial video, we’ll answer the question, 「What’s the difference between merging and rebasing in Git?」

git-blame - Show what revision and author last modified each line of a file

• https://git-scm.com/docs/git-blame

git-branch - List, create, or delete branches

• https://git-scm.com/docs/git-branch#Documentation/git-branch.txt--d
• How do I delete a Git branch locally and remotely? - Stack Overflow
  • https://stackoverflow.com/questions/2003505/how-do-i-delete-a-git-branch-locally-and-remotely#targetText=Simply%20do%20git%20push%20origin,local%20branch%20ONLY!...
  • Executive Summary
    • $ git push --delete <remote_name> <branch_name>
    • $ git branch -d <branch_name>
    • Note that in most cases the remote name is origin.
  • Delete Local Branch
    • To delete the local branch use one of the following:
    • $ git branch -d branch_name
    • $ git branch -D branch_name
    • Note: The -d option is an alias for --delete, which only deletes the branch if it has already been fully merged in its upstream branch. You could also use -D, which is an alias for --delete --force, which deletes the branch "irrespective of its merged status." [Source: man git-branch]

Git - git-bundle Documentation

• https://git-scm.com/docs/git-bundle
• git-bundle - Move objects and refs by archive
• $ git bundle create mybundle v1.0.0..master

Git Diff | Atlassian Git Tutorial

• https://www.atlassian.com/git/tutorials/saving-changes/git-diff
• Comparing files: git diff file
  • $ git diff master ./diff_test.txt
• Comparing two branches
  • $ git diff master new_branch
• Comparing files from two branches
  • $ git diff master new_branch ./diff_test.txt　　

Git - git-gui Documentation

• https://git-scm.com/docs/git-gui
• git-gui - A portable graphical interface to Git

Advanced Git Log | Atlassian Git Tutorial

• https://www.atlassian.com/git/tutorials/git-log
• The advanced features of git log can be split into two categories: formatting how each commit is displayed, and filtering which commits are included in the output.
  • $ git log -5
  • $ git log --after='2019-8-8'

Git Push | Atlassian Git Tutorial

• https://www.atlassian.com/git/tutorials/syncing/git-push
• $ git push origin master

Resetting, Checking Out & Reverting | Atlassian Git Tutorial

• https://www.atlassian.com/git/tutorials/resetting-checking-out-and-reverting
• $ git checkout master ./rollback_test.txt

Git - git-reset Documentation

• https://git-scm.com/docs/git-reset
• git-reset - Reset current HEAD to the specified state
• $ git reset HEAD test.py

git stash - Saving Changes | Atlassian Git Tutorial

• https://www.atlassian.com/git/tutorials/saving-changes/git-stash
• git stash temporarily shelves (or stashes) changes you've made to your working copy so you can work on something else, and then come back and re-apply them later on. Stashing is handy if you need to quickly switch context and work on something else, but you're mid-way through a code change and aren't quite ready to commit.
• $ git stash save "for debug use only" 
• $ git stash list
• $ git pull
• $ git stash pop

---

How to merge feature branch with conflict ?

• Resolve merge conflicts - Atlassian Documentation
  • https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html
• Solved: How can I solve a conflict in a pull request?
  • https://community.atlassian.com/t5/Bitbucket-questions/How-can-I-solve-a-conflict-in-a-pull-request/qaq-p/577205

How to create and apply changes in working directory ?

• Create a git patch from the changes in the current working directory - Stack Overflow
  • https://stackoverflow.com/questions/5159185/create-a-git-patch-from-the-changes-in-the-current-working-directory
  • If you haven't yet commited the changes, then:
    • $ git diff > mypatch.patch
  • But sometimes it happens that part of the stuff you're doing are new files that are untracked and won't be in your git diff output. So, one way to do a patch is to stage everything for a new commit (git add each file, or just git add .) but don't do the commit, and then:
    • $ git diff --cached > mypatch.patch
  • Add the 'binary' option if you want to add binary files to the patch (e.g. mp3 files):
    • $ git diff --cached --binary > mypatch.patch
  • You can later apply the patch:
    • $ git apply mypatch.patch
  • Note: You can also use --staged as a synonym of --cached.