Giter Site home page Giter Site logo

git-flow-cheatsheet's Introduction

git-flow-cheatsheet

A cheatsheet on the usage of git flow, visit http://danielkummer.github.io/git-flow-cheatsheet/

GIT FLOW

Git extensions to provide high-level repository operations for Vincent Driessen's branching model. Read more

INIT:

$ git flow init

TRACK DEVELOP REMOTELY ON GITHUB:

$ git push origin develop

FEATURES:

Use to develop new features starting from the develop branch. Merge back into develop branch waiting for a reasonable amount of features to be there before declaring it a release.

$ git flow feature
$ git flow feature start <name>
$ git flow feature finish <name>
usage: git flow feature [list] [-v]
       git flow feature start [-F] <name> [<base>]
       git flow feature finish [-rFk] <name|nameprefix>
       git flow feature publish <name>
       git flow feature track <name>
       git flow feature diff [<name|nameprefix>]
       git flow feature rebase [-i] [<name|nameprefix>]
       git flow feature checkout [<name|nameprefix>]
       git flow feature pull <remote> [<name>]

RELEASES:

Use to group together latest development (features) add a few finishing touches if necessary and send to production. All last changes will merge back to master and develop so new features will start from current release.

$ git flow release
$ git flow release start <release> [<base>]
$ git flow release finish <release>
usage: git flow release [list] [-v]
       git flow release start [-F] <version>
       git flow release finish [-Fsumpk] <version>
       git flow release publish <name>
       git flow release track <name>

HOTFIXES:

Similar to releases but the hotfix branch starts off master to avoid unvoluntary send to production of unwanted features that my be present in branches. The quick fix must be used when an important bug arises in production which must be fixed and can't wait for other features to be ready. It merges back to master and develop.

$ git flow hotfix
$ git flow hotfix start <release> [<base>]
$ git flow hotfix finish <release>
usage: git flow hotfix [list] [-v]
       git flow hotfix start [-F] <version> [<base>]
       git flow hotfix finish [-Fsumpk] <version>

git-flow-cheatsheet's People

Contributors

arb195 avatar arseniy-shapovalov-ss avatar axelwehner avatar baivong avatar bmarkovic avatar bpaulin avatar danielkummer avatar diphendara avatar dominhhai avatar eazel7 avatar gelosie avatar herve-mirguet avatar isatrio avatar jahangir-sh avatar mmathys avatar msonsona avatar mylxsw avatar nfrancois avatar ppyzik avatar rafaelstz avatar rahmatwaisi avatar rogeriopradoj avatar shu85t avatar tan9 avatar tayfunoziserikan avatar tfunato avatar thangcquet avatar tpai avatar zenkay avatar zygimantus avatar

Stargazers

 avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar

Watchers

 avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar

git-flow-cheatsheet's Issues

Can Git Flow interoperate between two different repositories

For Eg:

I have repo named FRUITS having branches apple, banana and I have SMOOTHY having branches apple, banana and blueberry.

Now, lets say SMOOTHY is a team repo and FRUITS is the main repo. How will git flow work if I had to create a feature from SMOOTHY and then merge it into the apple branch in FRUITS repo. ?

Again I do like the idea of git flow, I am just trying to understand how can it fit our needs.

Thanks,
Ishan

git-flow vs git-flow-avh

The install instructions tell to install git-flow-avh which is a newer fork of the original git-flow. One of the key differences is that release and hotfix-tags are not solely present on the master branch. The visual representation however suggests that. What git-flow-avh actually does is merge the tag back into develop instead of merging the release/hotfix tip into both develop and master and then just tagging the merge-commit on master.

Add shortcuts

A guess that would be cool. If had shortcuts to the commands? such as:

Instead of: git flow feature start new-feature.
Would be: git flow f start new-feature
Or: git flow f s new-feature.

Because the terminal does not auto complete, and is the long command to type.

Translation into pt_BR (Brazilian Portuguese)

Hello, @danielkummer

First, congrats for the work, nice job!

I'd like to translate the project into pt_BR, and for that I'm forking the repo.

How you suggest me to organize the translation:

  • a folder language
  • a folder pt-br in root
  • any other way

Thanks in advance!

Redesign!

A complete redesign of the git-flow cheatsheet is planned which will also include nice printable versions of the cheatsheet. But because of other things currently occupying my time this will happen not tomorrow but somewhen in 2016 :)

Firefox blocks non-SSL connections to the Google fonts API

Because of default security policy of Firefox, some parts of the page are disabled. The font wont get loaded. The CSS rule for the font-family will use cursive, because the font can't be found. You want to see the result in my browser? Ok:

comic_sans

Yes, it is Comic Sans. No, you don't want this.

git flow release start is off master

Hi,

I don't understand what the problem but when i execute git flow release start 1.0 the message says

Switched to a new branch 'release/1.0'

Summary of actions:
- A new branch 'release/1.0' was created, based on 'master'
- You are now on branch 'release/1.0'

Follow-up actions:
- Bump the version number now!
- Start committing last-minute fixes in preparing your release
- When done, run:

     git flow release finish '1.0'

From what i understand it should be off develop

What can be the problem and how to debug it and fix it?

error with git-flow version subcommand

I'm working on a git project and I tried all git-flow commands

$ git-flow version
/usr/local/bin/git-flow: line 118: init: command not found
0.4.2-pre

Disable merge messages

Hi,

How to disable merge messages? I don't want to have something like "Merge branch hotfix/name". I tried to leave it blank but I can't.

git flow feature pull will be deprecated per version 2.0.0

Hello,
after writing command : $ git flow feature pull origin MYFEATURE
->The command 'git flow feature pull' will be deprecated per version 2.0.0. Use 'git flow feature track' instead.
Is it possible to upadte cheatsheet, please?
Thx !
Yann

pull a publish-ed hotfix

How do I pull a published hotfix?

Scenario:

  • master branch is locked to avoid uncontrolled release (Mike is a master and he has the power, Tom is a humble programmer and he cannot touch the master branch)
  • a bug arises and is fixed by Tom who:
    • git flow hotfix start ...
    • work hard to fix the bug
    • git flow hotfix publish

Now is Mike's turn: how would he fetch the hotfix in order to perform a clean git flow hotfix finish?

Angular 10 - Library angular-vertical-timeline

Hi,

I recently update to Angular 10 and when I build my app, I get the bellow issue.

node_modules/angular-vertical-timeline/dist/vertical-timeline.module.d.ts:2:22 - error NG6002: Appears in the NgModule.imports of OrderServiceModule, but could not be resolved to an NgModule class.
This likely means that the library (angular-vertical-timeline) which declares VerticalTimelineModule has not been processed correctly by ngcc, or is not compatible with Angular Ivy. Check if a newer version of the library is available, and update if so. Also consider checking with the library's authors to see if the library is expected to be compatible with Ivy.
2 export declare class VerticalTimelineModule {

Sincerely,
Hugo Barboza

License?

Hello,

under what license is this work published? Can I modify it and use it at work to train my staff?

Would you care adding a LICENSE file at the root of the repo?

KTGW!
-- YSC

Linux installation

Linux installation instruction in cheatsheet only for Debian based distros. Instructions for Red Hat based distros should be added.

feature track does not replace feature pull!

Hi, whenever I use git flow feature pull I get a message saying it will be deprecated and I should use feature track instead. However, when I'm trying to switch to a feature branch and pull it, if I already have that local branch then feature track will not work because it attempts to create the local branch. If you want feature track to replace feature pull then you need to make sure it checks for the local branch first and if there is one it should make sure it's tracking the correct remote branch and only attempt to create a local branch if the branch doesn't exist already.

Printed version needs a total review

To help my fellow colleagues starting using git flow, I tried to print the cheatsheet.

Why do I believe that it is a valid use-case? Because this page is "sold" as a cheat sheet (= reference card). And as Wikipedia says, it is a common usage to print them.

I tried to print this cheatsheet on both Firefox and Chrome.

Here are some issues I saw:

  • The comment section shouldn't be present.
  • The list of translations shouldn't be present.
  • The paragraphs are short so there shouldn't be any orphan.
  • All interesting images are on the background and are therefore not visible by default.
  • URLs should have the same style as the text it's wrapped in and should be written down next to the text they refer to.
  • With the stripes, there is some yellow on yellow title text, making it hard to read (specifically "Make a release").

Issues specific to Firefox:

  • The content-part of first page is totally striped.
  • The "feature" 5-lines background starts in section "Getting started" and stop around the "hotfix" title.

I noticed no issue specific to Chrome.

Website: Installations instructions for wget `--no-check-certificate`

Why on hell do you suggest to use --no-check-certificatewith wget when downloading an installation script, which is immediately executed after it is downloaded? (Windows instructions)
This opens a ๐Ÿšช for everyone wanting to install malware on your system or modify git flow or so...

I mean it is already only HTTPS, which is used for verifying the files there, so one should not disable the verification of the certificate now to make it even worse.

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.