Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Fix merge --no-ff #98

Open
wants to merge 2 commits into
base: gh-pages
Choose a base branch
from
Open

WIP: Fix merge --no-ff #98

wants to merge 2 commits into from

Commits on Jul 9, 2017

  1. WIP: git-school#83 add support for --no-ff with few commits

    @IanLee1521
    IanLee1521 committed Jul 9, 2017
    Configuration menu
    Copy the full SHA
    bd8c288 View commit details
    Browse the repository at this point in the history

  2. Fixes the new case, but breaks the normal --no-ff functionality 

    where to branches are not able to fast forward anyways
    @IanLee1521
    IanLee1521 committed Jul 9, 2017
    Configuration menu
    Copy the full SHA
    8790c69 View commit details
    Browse the repository at this point in the history