Skip to content

Instantly share code, notes, and snippets.

@kjunggithub

kjunggithub/gist:8330157

Last active July 18, 2024 02:34
Download ZIP

Revisions

  1. kjunggithub revised this gist Jan 9, 2014. 1 changed file with 0 additions and 1 deletion.
    1 change: 0 additions & 1 deletion gistfile1.md
    View file
    Original file line number Diff line number Diff line change
    @@ -10,7 +10,6 @@ CD into the repository folder and run the init command to enable to hub flow too
    cd repo_name
    git hf init
    ```
    [email protected]:kjunggithub/webkit2png-php.git
    ## Feature Lifecycle
    <table>
    <tr><th> Syntax </th> <th> Description </th></tr>
  2. kjunggithub revised this gist Jan 9, 2014. 1 changed file with 2 additions and 2 deletions.
    4 changes: 2 additions & 2 deletions gistfile1.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,7 +1,7 @@
    # Git HubFlow Cheat Sheet
    ## Preparing the repository
    Create the repository on GitHub/Bitbucket
    Clone the created repository to your local machine using:
    Create the repository on GitHub/Bitbucket.
    Once created, clone the created repository to your local machine using:
    ```
    git clone [email protected]:username/repository.git
    ```
  3. kjunggithub revised this gist Jan 9, 2014. 1 changed file with 5 additions and 7 deletions.
    12 changes: 5 additions & 7 deletions gistfile1.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,18 +1,16 @@
    # Git Cheat Sheet for Cosmo Developers

    # Git HubFlow Cheat Sheet
    ## Preparing the repository
    If this is a new repository, create it on GitHub, then create a remote **develop** branch.

    Clone the repository to your local machine using command line or **Github Fow Windows** GUI:
    Create the repository on GitHub/Bitbucket
    Clone the created repository to your local machine using:
    ```
    git clone https://github.com/CloudifySource/repo_name.git
    git clone git@github.com:username/repository.git
    ```
    CD into the repository folder and run the init command to enable to hub flow tools:
    ```
    cd repo_name
    git hf init
    ```

    [email protected]:kjunggithub/webkit2png-php.git
    ## Feature Lifecycle
    <table>
    <tr><th> Syntax </th> <th> Description </th></tr>
  4. kjunggithub renamed this gist Jan 9, 2014. 1 changed file with 0 additions and 1 deletion.
    1 change: 0 additions & 1 deletion gistfile1 → gistfile1.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,3 @@

    # Git Cheat Sheet for Cosmo Developers

    ## Preparing the repository
  5. Kevin Jung created this gist Jan 9, 2014.
    30 changes: 30 additions & 0 deletions gistfile1
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,30 @@

    # Git Cheat Sheet for Cosmo Developers

    ## Preparing the repository
    If this is a new repository, create it on GitHub, then create a remote **develop** branch.

    Clone the repository to your local machine using command line or **Github Fow Windows** GUI:
    ```
    git clone https://github.com/CloudifySource/repo_name.git
    ```
    CD into the repository folder and run the init command to enable to hub flow tools:
    ```
    cd repo_name
    git hf init
    ```

    ## Feature Lifecycle
    <table>
    <tr><th> Syntax </th> <th> Description </th></tr>
    <tr><td> <code>git hf feature start feature_name</code> </td> <td> Start a new feature called <b>feature_name</b> (you need to pull changes to your local develop branch first) </td></tr>
    <tr><td> <code>git hf feature track feature_name</code> </td> <td> Join the <b>feature_name</b> feature which has already started </td></tr>
    <tr><td> <code>git hf feature checkout feature_name</code> </td> <td> Switch to the <b>feature_name</b> feature (useful when working on multiple features) </td></tr>
    <tr><td> commit </td><td> Commit changes to the local feature branch using your favourite tool (IDE, command line, TortoiseGit, etc)</td></tr>
    <tr><td> <code>git hf push</code> </td> <td> Push committed changes to the remote feature branch for collaboration or backup </td></tr>
    <tr><td> <code>git hf pull</code> </td> <td> Pull changes made by others from the remote branch</td></tr>
    <tr><td> <code>git hf update</code><br/><code>git merge develop</code></td> <td> Update the local <b>develop</b> branch with completed features and merge them into the local feature branch</td></tr>
    <tr><td> <code>git hf feature submit</code> </td> <td> Submit a pull request to merge the remote feature branch into the remote <b>develop</b> branch</td></tr>
    <tr><td> <code>git hf feature finish</code> </td> <td> Delete the local & remote feature branches after it has been merged back to the remote <b>develop</b> branch</td></tr>
    <tr><td> <code>git hf feature cancel -f feature_name </code> </td> <td> Delete the local & remote feature branches without merging to the remote <b>develop</b> branch</td></tr>
    </table>