FM / git-core

/usr/libexec/git-core

Name	Size	Mode	Actions
mergetools/	-	0755	rm
git	3845928	0755	edit dl rm
git-add	3845928	0755	edit dl rm
git-am	3845928	0755	edit dl rm
git-annotate	3845928	0755	edit dl rm
git-apply	3845928	0755	edit dl rm
git-archive	3845928	0755	edit dl rm
git-bisect	3845928	0755	edit dl rm
git-blame	3845928	0755	edit dl rm
git-branch	3845928	0755	edit dl rm
git-bugreport	3845928	0755	edit dl rm
git-bundle	3845928	0755	edit dl rm
git-cat-file	3845928	0755	edit dl rm
git-check-attr	3845928	0755	edit dl rm
git-check-ignore	3845928	0755	edit dl rm
git-check-mailmap	3845928	0755	edit dl rm
git-check-ref-format	3845928	0755	edit dl rm
git-checkout	3845928	0755	edit dl rm
git-checkout--worker	3845928	0755	edit dl rm
git-checkout-index	3845928	0755	edit dl rm
git-cherry	3845928	0755	edit dl rm
git-cherry-pick	3845928	0755	edit dl rm
git-clean	3845928	0755	edit dl rm
git-clone	3845928	0755	edit dl rm
git-column	3845928	0755	edit dl rm
git-commit	3845928	0755	edit dl rm
git-commit-graph	3845928	0755	edit dl rm
git-commit-tree	3845928	0755	edit dl rm
git-config	3845928	0755	edit dl rm
git-contacts	4509	0755	edit dl rm
git-count-objects	3845928	0755	edit dl rm
git-credential	3845928	0755	edit dl rm
git-credential-cache	3845928	0755	edit dl rm
git-credential-cache--daemon	3845928	0755	edit dl rm
git-credential-netrc	10945	0755	edit dl rm
git-credential-store	3845928	0755	edit dl rm
git-describe	3845928	0755	edit dl rm
git-diagnose	3845928	0755	edit dl rm
git-diff	3845928	0755	edit dl rm
git-diff-files	3845928	0755	edit dl rm
git-diff-index	3845928	0755	edit dl rm
git-diff-tree	3845928	0755	edit dl rm
git-difftool	3845928	0755	edit dl rm
git-difftool--helper	2609	0755	edit dl rm
git-fast-export	3845928	0755	edit dl rm
git-fast-import	3845928	0755	edit dl rm
git-fetch	3845928	0755	edit dl rm
git-fetch-pack	3845928	0755	edit dl rm
git-filter-branch	15857	0755	edit dl rm
git-fmt-merge-msg	3845928	0755	edit dl rm
git-for-each-ref	3845928	0755	edit dl rm
git-for-each-repo	3845928	0755	edit dl rm
git-format-patch	3845928	0755	edit dl rm
git-fsck	3845928	0755	edit dl rm
git-fsck-objects	3845928	0755	edit dl rm
git-fsmonitor--daemon	3845928	0755	edit dl rm
git-gc	3845928	0755	edit dl rm
git-get-tar-commit-id	3845928	0755	edit dl rm
git-grep	3845928	0755	edit dl rm
git-hash-object	3845928	0755	edit dl rm
git-help	3845928	0755	edit dl rm
git-hook	3845928	0755	edit dl rm
git-http-backend	2249408	0755	edit dl rm
git-http-fetch	2283224	0755	edit dl rm
git-http-push	2291448	0755	edit dl rm
git-imap-send	2292104	0755	edit dl rm
git-index-pack	3845928	0755	edit dl rm
git-init	3845928	0755	edit dl rm
git-init-db	3845928	0755	edit dl rm
git-interpret-trailers	3845928	0755	edit dl rm
git-log	3845928	0755	edit dl rm
git-ls-files	3845928	0755	edit dl rm
git-ls-remote	3845928	0755	edit dl rm
git-ls-tree	3845928	0755	edit dl rm
git-mailinfo	3845928	0755	edit dl rm
git-mailsplit	3845928	0755	edit dl rm
git-maintenance	3845928	0755	edit dl rm
git-merge	3845928	0755	edit dl rm
git-merge-base	3845928	0755	edit dl rm
git-merge-file	3845928	0755	edit dl rm
git-merge-index	3845928	0755	edit dl rm
git-merge-octopus	2477	0755	edit dl rm
git-merge-one-file	3695	0755	edit dl rm
git-merge-ours	3845928	0755	edit dl rm
git-merge-recursive	3845928	0755	edit dl rm
git-merge-resolve	1226	0755	edit dl rm
git-merge-subtree	3845928	0755	edit dl rm
git-merge-tree	3845928	0755	edit dl rm
git-mergetool	11693	0755	edit dl rm
git-mergetool--lib	10728	0644	edit dl rm
git-mktag	3845928	0755	edit dl rm
git-mktree	3845928	0755	edit dl rm
git-multi-pack-index	3845928	0755	edit dl rm
git-mv	3845928	0755	edit dl rm
git-name-rev	3845928	0755	edit dl rm
git-notes	3845928	0755	edit dl rm
git-pack-objects	3845928	0755	edit dl rm
git-pack-redundant	3845928	0755	edit dl rm
git-pack-refs	3845928	0755	edit dl rm
git-patch-id	3845928	0755	edit dl rm
git-prune	3845928	0755	edit dl rm
git-prune-packed	3845928	0755	edit dl rm
git-pull	3845928	0755	edit dl rm
git-push	3845928	0755	edit dl rm
git-quiltimport	3693	0755	edit dl rm
git-range-diff	3845928	0755	edit dl rm
git-read-tree	3845928	0755	edit dl rm
git-rebase	3845928	0755	edit dl rm
git-receive-pack	3845928	0755	edit dl rm
git-reflog	3845928	0755	edit dl rm
git-remote	3845928	0755	edit dl rm
git-remote-ext	3845928	0755	edit dl rm
git-remote-fd	3845928	0755	edit dl rm
git-remote-ftp	2299664	0755	edit dl rm
git-remote-ftps	2299664	0755	edit dl rm
git-remote-http	2299664	0755	edit dl rm
git-remote-https	2299664	0755	edit dl rm
git-repack	3845928	0755	edit dl rm
git-replace	3845928	0755	edit dl rm
git-request-pull	4147	0755	edit dl rm
git-rerere	3845928	0755	edit dl rm
git-reset	3845928	0755	edit dl rm
git-restore	3845928	0755	edit dl rm
git-rev-list	3845928	0755	edit dl rm
git-rev-parse	3845928	0755	edit dl rm
git-revert	3845928	0755	edit dl rm
git-rm	3845928	0755	edit dl rm
git-send-pack	3845928	0755	edit dl rm
git-sh-i18n	1683	0644	edit dl rm
git-sh-i18n--envsubst	2236528	0755	edit dl rm
git-sh-setup	8398	0644	edit dl rm
git-shell	2236688	0755	edit dl rm
git-shortlog	3845928	0755	edit dl rm
git-show	3845928	0755	edit dl rm
git-show-branch	3845928	0755	edit dl rm
git-show-index	3845928	0755	edit dl rm
git-show-ref	3845928	0755	edit dl rm
git-sparse-checkout	3845928	0755	edit dl rm
git-stage	3845928	0755	edit dl rm
git-stash	3845928	0755	edit dl rm
git-status	3845928	0755	edit dl rm
git-stripspace	3845928	0755	edit dl rm
git-submodule	10508	0755	edit dl rm
git-submodule--helper	3845928	0755	edit dl rm
git-switch	3845928	0755	edit dl rm
git-symbolic-ref	3845928	0755	edit dl rm
git-tag	3845928	0755	edit dl rm
git-unpack-file	3845928	0755	edit dl rm
git-unpack-objects	3845928	0755	edit dl rm
git-update-index	3845928	0755	edit dl rm
git-update-ref	3845928	0755	edit dl rm
git-update-server-info	3845928	0755	edit dl rm
git-upload-archive	3845928	0755	edit dl rm
git-upload-pack	3845928	0755	edit dl rm
git-var	3845928	0755	edit dl rm
git-verify-commit	3845928	0755	edit dl rm
git-verify-pack	3845928	0755	edit dl rm
git-verify-tag	3845928	0755	edit dl rm
git-version	3845928	0755	edit dl rm
git-web--browse	4401	0755	edit dl rm
git-whatchanged	3845928	0755	edit dl rm
git-worktree	3845928	0755	edit dl rm
git-write-tree	3845928	0755	edit dl rm
scalar	2290912	0755	edit dl rm

Edit: /usr/libexec/git-core/git-merge-octopus (2477B)

#!/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"

cmd: