Skip to content

Add no-ff merge option. #471

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

Merged
merged 2 commits into from
Dec 22, 2020
Merged

Add no-ff merge option. #471

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd31149
Add no-ff merge option.
hokita Jun 13, 2020
e2e2f6a
Merge branch 'master' into add_no_ff_merge
jcouball Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into add_no_ff_merge
  • Loading branch information
@jcouball
jcouball authored Dec 22, 2020
commit e2e2f6acdfc4cde8655d08d1f40600b27ed99c28
13 changes: 6 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,12 @@ g.checkout(g.branch('new_branch'))
g.branch(name).merge(branch2)
g.branch(branch2).merge # merges HEAD with branch2

g.branch(name).in_branch(message) { # add files } # auto-commits
g.merge('new_branch')
g.merge('new_branch', 'merge commit message')
g.merge('new_branch', 'merge commit message', no_ff: true)
g.merge('origin/remote_branch')
g.merge(g.branch('master'))
g.merge([branch1, branch2])
g.branch(name).in_branch(message) { # add files } # auto-commits
g.merge('new_branch')
g.merge('new_branch', 'merge commit message', no_ff: true)
g.merge('origin/remote_branch')
g.merge(g.branch('master'))
g.merge([branch1, branch2])

g.merge_base('branch1', 'branch2')

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.