class Git::Lib

def merge(branch, message = nil)

def merge(branch, message = nil)      
  arr_opts = []
  arr_opts << '-m' << message if message
  arr_opts += [branch]
  command('merge', arr_opts)
end

Instance Methods

# add
# apply
# apply_mail
# archive
# branch_current
# branch_delete
# branch_new
# branches_all
# change_head_branch
# checkout
# checkout_file
# checkout_index
# clone
# command
# command_lines
# commit
# commit_data
# commit_tree
# config_get
# config_list
# config_remote
# config_set
# conflicts
# diff_files
# diff_full
# diff_index
# diff_stats
# escape
# fast_import
# fetch
# full_log_commits
# full_tree
# gc
# grep
# init
# initialize
# list_files
# log_commits
# ls_files
# ls_tree
# merge
# mv
# namerev
# object_contents
# object_size
# object_type
# parse_config
# process_commit_data
# push
# read_tree
# remote_add
# remote_remove
# remotes
# remove
# repack
# reset
# revparse
# run_command
# stash_apply
# stash_clear
# stash_list
# stash_save
# stashes_all
# tag
# tag_sha
# tags
# tree_depth
# unmerged
# update_ref
# write_tree

Modules

Classes

class Git::Lib

def merge(branch, message = nil)

Instance Methods