Contents

#!/usr/bin/env ruby
$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
require 'git-utils/merge_branch'

# Merges the current branch into the given branch (defaults to master).
# E.g., 'git merge-branch foobar' merges the current branch into foobar.
# 'git merge-branch', merges the current branch into master.
# git merge-branch uses the --no-ff --log options to ensure that the
# merge creates a new commit object and that the individual commits appear
# in the log file.
exit Command.run!(MergeBranch, ARGV.dup)

Version data entries

23 entries across 23 versions & 1 rubygems

Version	Path
git-utils-1.0.0	bin/git-merge-branch
git-utils-0.7.1	bin/git-merge-branch
git-utils-0.7.0	bin/git-merge-branch
git-utils-0.6.5	bin/git-merge-branch
git-utils-0.6.4	bin/git-merge-branch
git-utils-0.6.3	bin/git-merge-branch
git-utils-0.6.2	bin/git-merge-branch
git-utils-0.6.1	bin/git-merge-branch
git-utils-0.6.0	bin/git-merge-branch
git-utils-0.5.10	bin/git-merge-branch
git-utils-0.5.9	bin/git-merge-branch
git-utils-0.5.8	bin/git-merge-branch
git-utils-0.5.7	bin/git-merge-branch
git-utils-0.5.6	bin/git-merge-branch
git-utils-0.5.5	bin/git-merge-branch
git-utils-0.5.4	bin/git-merge-branch
git-utils-0.5.3	bin/git-merge-branch
git-utils-0.5.2	bin/git-merge-branch
git-utils-0.5.1	bin/git-merge-branch
git-utils-0.5.0	bin/git-merge-branch