jaysoffian

#!/bin/sh -x
# remerge <onto> [<merge_commit>]
# e.g.: remerge origin/trunk
# merge_commit defaults to HEAD

onto=$1
mc=${2:-HEAD}

mc_sha=$(git rev-parse $mc)    # original merge commit
p1_sha=$(git rev-parse $onto)  # what we want its new first parent to be

tvogel

#!/bin/bash
#
# Purpose: manually associate missed renames in merge conflicts
#
# Usage: git merge-associate <our-target> <base> <theirs>
#
# Example: After a failed rename detection A/a -> B/b which results
# in CONFLICT (delete/modify) for A/a and corresponding "deleted by us"
# messages in git status, the following invocation can be used to manually
# establish the link: