学习笔记之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. 

Introducing GitFlow

• https://datasift.github.io/gitflow/IntroducingGitFlow.html
• GitFlow is a branching model for Git, created by Vincent Driessen. It has attracted a lot of attention because it is very well suited to collaboration and scaling the development team.

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?__biz=MzUyODg4Nzk2MQ==&mid=2247490430&idx=3&sn=b5e284cd5a5bb62da3819e29f0e29fa3&source=41#wechat_redirect
• https://www.jianshu.com/p/072587b47515
• 一、Git工作流程
• 二、常用Git命令

Git入门

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

• 版本控制介绍

  • 什么是版本控制

  • 为什么要版本控制

  • 本地版本控制系统

  • 集中化的版本控制系统

  • 分布式版本控制系统

• 认识 Git
  • Git 简史
  • Git 与其他版本管理系统的主要区别
  • Git 的三种状态
• Git 使用快速入门
  • 获取 Git 仓库
  • 记录每次更新到仓库
  • 推送改动到远程仓库
  • 远程仓库的移除与重命名
  • 查看提交历史
  • 撤销操作
  • 分支
• 推荐阅读

Git原理入门解析

• https://mp.weixin.qq.com/s/kw7fChfvLsfFYTgmO0-hsw

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
• 一、 创建与合并分支
• 二、 解决冲突
• 三、Bug分支
• 四、版本回退
• 五、撤销修改
• 六、对于已经push的版本，进行回退
• 七、本地同步远程删除的分支
• 八、删除掉没有与远程分支对应的本地分支
• 九、查看远程库的一些信息，及与本地分支的信息
• 十、git stash临时保存本地操作

你可能会忽略的 Git 提交规范 - Linux学习

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

大厂 Git 提交规范

• https://mp.weixin.qq.com/s/ouJlkTFu8DEEb6HelqHiVA
• https://juejin.im/post/5d0b3f8c6fb9a07ec07fc5d0

Git 分支设计规范

• https://mp.weixin.qq.com/s/6d6r-Z86mxvuUfFtT2cetg

---

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文件
• 3、别名
• 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
• https://towardsdatascience.com/learn-enough-git-to-be-useful-281561eef959

20 个最常用的 Git 命令用法说明及示例

• https://mp.weixin.qq.com/s/acP4yklWYf5TwOrLB41JYg
• https://dzone.com/articles/top-20-git-commands-with-examples

团队开发中的 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
• https://juejin.im/post/5d5b4c6951882569eb570958

通过 .git 目录深入理解 Git！

• https://mp.weixin.qq.com/s/q6tI0qctvciJhNz_5KLx-w
• https://www.daolf.com/posts/git-series-part-1/

Merging vs Rebasing

• Merging vs. Rebasing | Atlassian Git Tutorial
  • https://www.atlassian.com/git/tutorials/merging-vs-rebasing
• 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

Git - gitk Documentation

• https://git-scm.com/docs/gitk
• gitk - The Git repository browser
• Git - gitk and git-gui | git Tutorial
  • https://riptutorial.com/git/example/18336/gitk-and-git-gui

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 - git-mv Documentation

• https://git-scm.com/docs/git-mv
• git-mv - Move or rename a file, a directory, or a symlink
• $ git mv old.py new.py

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

squash

• Git - Rewriting History
  • https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

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.

来源：oschina

链接：https://my.oschina.net/u/4411208/blog/4015704