Skip to content

Instantly share code, notes, and snippets.

@timurvafin
Created April 15, 2011 15:21
Show Gist options
  • Save timurvafin/921876 to your computer and use it in GitHub Desktop.
Save timurvafin/921876 to your computer and use it in GitHub Desktop.

Git

Git - распределённая система управления версиями файлов.

  • работа в offlen: создание репозитория, коммиты, работа с ветками, полная и копия всех версий

  • супер быстрое и удобное слияние веток

Полцентрализованная система

  • нет центрального репозитория на техническом уровне

  • доверенный репозиторий на уровне договоренности

Git flow

$ brew install git-flow
$ git flow init

Основные ветки

  • master

  • develop

Supporting branches

features

  • –no-ff

  • git flow feature

  • git flow feature start <name> [<base>]

  • A new branch ‘feature/sign_in’ was created, based on ‘develop’

  • You are now on branch ‘feature/sign_in’

  • git flow feature finish <name>

  • The feature branch ‘feature/sign_in’ was merged into ‘develop’

  • Feature branch ‘feature/sign_in’ has been removed

  • You are now on branch ‘develop’

  • release

    git flow release
    git flow release start <release> [<base>]
    git flow release finish <release
  • hotfix

    git flow hotfix
    git flow hotfix start <release> [<base>]
    git flow hotfix finish <release>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment