git和git-flow

2018/11/12

一 git

该文档标注了使用Git必须掌握的命令.

阅读完该文档后,您将会了解到:

  • 什么是Git.
  • Git的基本命令

1、Git常用命令列表

分散式版本控制软件 Git (/ɡɪt/) is a distributed revision control system with an emphasis on speed data integrity, and support for distributed, non-linear workflows

请查看: 什么是版本控制?

git --help
usage: git [--version] [--help] [-C <path>] [-c name=value]
           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]
           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
           <command> [<args>]

The most commonly used git commands are:
   add        Add file contents to the index
   bisect     Find by binary search the change that introduced a bug
   branch     List, create, or delete branches
   checkout   Checkout a branch or paths to the working tree
   clone      Clone a repository into a new directory
   commit     Record changes to the repository
   diff       Show changes between commits, commit and working tree, etc
   fetch      Download objects and refs from another repository
   grep       Print lines matching a pattern
   init       Create an empty Git repository or reinitialize an existing one
   log        Show commit logs
   merge      Join two or more development histories together
   mv         Move or rename a file, a directory, or a symlink
   pull       Fetch from and integrate with another repository or a local branch
   push       Update remote refs along with associated objects
   rebase     Forward-port local commits to the updated upstream head
   reset      Reset current HEAD to the specified state
   rm         Remove files from the working tree and from the index
   show       Show various types of objects
   status     Show the working tree status
   tag        Create, list, delete or verify a tag object signed with GPG

'git help -a' and 'git help -g' list available subcommands and some
concept guides. See 'git help <command>' or 'git help <concept>'
to read about a specific subcommand or concept.

常用命令列表

    git clone
    git status
    git checkout
    git branch -a|-r
    git add
    git commit
    git rm
    git remote update -p
    git push origin XXX
    git push origin :XXX
    git pull origin XXX
    git merge
    git log
    git blame
    git diff XXX
    git stash
    git push origin --delete
    git gc
    git init
    git branch -m 'name'

可以通过git [command] –help 来查看每一个命令的含义,如查看git checkout, 只需要在控制台中输入 git checkout –help 即可

请查看: Git命令文档

Git目录结构和配置

  • 配置 git config –global user.name git config –global user.email

  • 目录结构

    .git 每个文件是做什么用的
    .git/config 文件每一行的意思
    .gitignore
    

配置介绍

二 git-flow

Git原理

该文档列出了掌握Git Flow基本原理的资源.

阅读完该文档后,您将会了解到:

  • Git Flow的原理.
  • Git Flow的基本命令

请查看: Git常用命令

Git Flow工作原理

git-flow

why-arent-you-using-git-flow

常见问题

  • Git Flow 解决了什么问题, 其基本思想是什么?
  • Git Flow中的分支从哪里而来,最后到哪里去?
  • Git Flow中的命令和Git中的命令是如何对应的?

Git Flow常用命令

  • git flow init
  • git flow feature start
  • git flow feature publish
  • git flow feature track
  • git flow feature finish

  • git flow release [start publlish track finish]

Git Flow在团800的使用流程

  • 分支命名规则 git flow feature start rm1024_maxiaohun_20120925_fix_some_bugs


Show Disqus Comments