예제 #1
0
def merge_message(revision):
    """Return a merge message for FETCH_HEAD."""
    fetch_head = git.git_path("FETCH_HEAD")
    if core.exists(fetch_head):
        return git.fmt_merge_msg("--file", fetch_head)[STDOUT]
    return "Merge branch '%s'" % revision
예제 #2
0
def merge_message(revision):
    """Return a merge message for FETCH_HEAD."""
    fetch_head = git.git_path('FETCH_HEAD')
    if core.exists(fetch_head):
        return git.fmt_merge_msg('--file', fetch_head)[STDOUT]
    return "Merge branch '%s'" % revision
예제 #3
0
파일: gitcmds.py 프로젝트: suside/git-cola 
def merge_message(revision):
    """Return a merge message for FETCH_HEAD."""
    fetch_head = git.git_path('FETCH_HEAD')
    if os.path.exists(fetch_head):
        return git.fmt_merge_msg('--file', fetch_head)
    return "Merge branch '%s'" % revision