GOLDEN HOUR

DIR: /usr/libexec/git-core

Name	Size	Action
git	4.06 MB
git-add	4.06 MB
git-am	4.06 MB
git-annotate	4.06 MB
git-apply	4.06 MB
git-archive	4.06 MB
git-bisect	4.06 MB
git-blame	4.06 MB
git-branch	4.06 MB
git-bugreport	4.06 MB
git-bundle	4.06 MB
git-cat-file	4.06 MB
git-check-attr	4.06 MB
git-check-ignore	4.06 MB
git-check-mailmap	4.06 MB
git-check-ref-format	4.06 MB
git-checkout	4.06 MB
git-checkout--worker	4.06 MB
git-checkout-index	4.06 MB
git-cherry	4.06 MB
git-cherry-pick	4.06 MB
git-clean	4.06 MB
git-clone	4.06 MB
git-column	4.06 MB
git-commit	4.06 MB
git-commit-graph	4.06 MB
git-commit-tree	4.06 MB
git-config	4.06 MB
git-contacts	4.4 KB
git-count-objects	4.06 MB
git-credential	4.06 MB
git-credential-cache	4.06 MB
git-credential-cache--daemon	4.06 MB
git-credential-netrc	10.69 KB
git-credential-store	4.06 MB
git-describe	4.06 MB
git-diagnose	4.06 MB
git-diff	4.06 MB
git-diff-files	4.06 MB
git-diff-index	4.06 MB
git-diff-tree	4.06 MB
git-difftool	4.06 MB
git-difftool--helper	2.77 KB
git-fast-export	4.06 MB
git-fast-import	4.06 MB
git-fetch	4.06 MB
git-fetch-pack	4.06 MB
git-filter-branch	15.49 KB
git-fmt-merge-msg	4.06 MB
git-for-each-ref	4.06 MB
git-for-each-repo	4.06 MB
git-format-patch	4.06 MB
git-fsck	4.06 MB
git-fsck-objects	4.06 MB
git-fsmonitor--daemon	4.06 MB
git-gc	4.06 MB
git-get-tar-commit-id	4.06 MB
git-grep	4.06 MB
git-hash-object	4.06 MB
git-help	4.06 MB
git-hook	4.06 MB
git-http-backend	795.89 KB
git-http-fetch	874.36 KB
git-http-push	1.19 MB
git-imap-send	857.29 KB
git-index-pack	4.06 MB
git-init	4.06 MB
git-init-db	4.06 MB
git-interpret-trailers	4.06 MB
git-log	4.06 MB
git-ls-files	4.06 MB
git-ls-remote	4.06 MB
git-ls-tree	4.06 MB
git-mailinfo	4.06 MB
git-mailsplit	4.06 MB
git-maintenance	4.06 MB
git-merge	4.06 MB
git-merge-base	4.06 MB
git-merge-file	4.06 MB
git-merge-index	4.06 MB
git-merge-octopus	2.42 KB
git-merge-one-file	3.61 KB
git-merge-ours	4.06 MB
git-merge-recursive	4.06 MB
git-merge-resolve	1.2 KB
git-merge-subtree	4.06 MB
git-merge-tree	4.06 MB
git-mergetool	11.42 KB
git-mergetool--lib	10.48 KB
git-mktag	4.06 MB
git-mktree	4.06 MB
git-multi-pack-index	4.06 MB
git-mv	4.06 MB
git-name-rev	4.06 MB
git-notes	4.06 MB
git-pack-objects	4.06 MB
git-pack-redundant	4.06 MB
git-pack-refs	4.06 MB
git-patch-id	4.06 MB
git-prune	4.06 MB
git-prune-packed	4.06 MB
git-pull	4.06 MB
git-push	4.06 MB
git-quiltimport	3.61 KB
git-range-diff	4.06 MB
git-read-tree	4.06 MB
git-rebase	4.06 MB
git-receive-pack	4.06 MB
git-reflog	4.06 MB
git-refs	4.06 MB
git-remote	4.06 MB
git-remote-ext	4.06 MB
git-remote-fd	4.06 MB
git-remote-ftp	911.29 KB
git-remote-ftps	911.29 KB
git-remote-http	911.29 KB
git-remote-https	911.29 KB
git-repack	4.06 MB
git-replace	4.06 MB
git-replay	4.06 MB
git-request-pull	4.05 KB
git-rerere	4.06 MB
git-reset	4.06 MB
git-restore	4.06 MB
git-rev-list	4.06 MB
git-rev-parse	4.06 MB
git-revert	4.06 MB
git-rm	4.06 MB
git-send-pack	4.06 MB
git-sh-i18n	1.64 KB
git-sh-i18n--envsubst	770.7 KB
git-sh-setup	8.2 KB
git-shell	770.68 KB
git-shortlog	4.06 MB
git-show	4.06 MB
git-show-branch	4.06 MB
git-show-index	4.06 MB
git-show-ref	4.06 MB
git-sparse-checkout	4.06 MB
git-stage	4.06 MB
git-stash	4.06 MB
git-status	4.06 MB
git-stripspace	4.06 MB
git-submodule	10.78 KB
git-submodule--helper	4.06 MB
git-switch	4.06 MB
git-symbolic-ref	4.06 MB
git-tag	4.06 MB
git-unpack-file	4.06 MB
git-unpack-objects	4.06 MB
git-update-index	4.06 MB
git-update-ref	4.06 MB
git-update-server-info	4.06 MB
git-upload-archive	4.06 MB
git-upload-pack	4.06 MB
git-var	4.06 MB
git-verify-commit	4.06 MB
git-verify-pack	4.06 MB
git-verify-tag	4.06 MB
git-version	4.06 MB
git-web--browse	4.3 KB
git-whatchanged	4.06 MB
git-worktree	4.06 MB
git-write-tree	4.06 MB
[ mergetools ]	-
scalar	819.34 KB

Edit: git-merge-octopus

#!/usr/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Resolve two or more trees.
#

. git-sh-setup

LF='
'

# The first parameters up to -- are merge bases; the rest are heads.
bases= head= remotes= sep_seen=
for arg
do
	case ",$sep_seen,$head,$arg," in
	*,--,)
		sep_seen=yes
		;;
	,yes,,*)
		head=$arg
		;;
	,yes,*)
		remotes="$remotes$arg "
		;;
	*)
		bases="$bases$arg "
		;;
	esac
done

# Reject if this is not an octopus -- resolve should be used instead.
case "$remotes" in
?*' '?*)
	;;
*)
	exit 2 ;;
esac

# MRC is the current "merge reference commit"
# MRT is the current "merge result tree"

if ! git diff-index --quiet --cached HEAD --
then
    gettextln "Error: Your local changes to the following files would be overwritten by merge"
    git diff-index --cached --name-only HEAD -- | sed -e 's/^/    /'
    exit 2
fi
MRC=$(git rev-parse --verify -q $head)
MRT=$(git write-tree)
NON_FF_MERGE=0
OCTOPUS_FAILURE=0
for SHA1 in $remotes
do
	case "$OCTOPUS_FAILURE" in
	1)
		# We allow only last one to have a hand-resolvable
		# conflicts.  Last round failed and we still had
		# a head to merge.
		gettextln "Automated merge did not work."
		gettextln "Should not be doing an octopus."
		exit 2
	esac

eval pretty_name=\${GITHEAD_$SHA1:-$SHA1}
	if test "$SHA1" = "$pretty_name"
	then
		SHA1_UP="$(echo "$SHA1" | tr a-z A-Z)"
		eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name}
	fi
	common=$(git merge-base --all $SHA1 $MRC) ||
		die "$(eval_gettext "Unable to find common commit with \$pretty_name")"

case "$LF$common$LF" in
	*"$LF$SHA1$LF"*)
		eval_gettextln "Already up to date with \$pretty_name"
		continue
		;;
	esac

if test "$common,$NON_FF_MERGE" = "$MRC,0"
	then
		# The first head being merged was a fast-forward.
		# Advance MRC to the head being merged, and use that
		# tree as the intermediate result of the merge.
		# We still need to count this as part of the parent set.

eval_gettextln "Fast-forwarding to: \$pretty_name"
		git read-tree -u -m $head $SHA1 || exit
		MRC=$SHA1 MRT=$(git write-tree)
		continue
	fi

NON_FF_MERGE=1

eval_gettextln "Trying simple merge with \$pretty_name"
	git read-tree -u -m --aggressive  $common $MRT $SHA1 || exit 2
	next=$(git write-tree 2>/dev/null)
	if test $? -ne 0
	then
		gettextln "Simple merge did not work, trying automatic merge."
		git merge-index -o git-merge-one-file -a ||
		OCTOPUS_FAILURE=1
		next=$(git write-tree 2>/dev/null)
	fi

MRC="$MRC $SHA1"
	MRT=$next
done

exit "$OCTOPUS_FAILURE"

GOLDEN HOUR

Edit: git-merge-octopus

TERMINAL