File Manager

X7ROOT File Manager

Current Path: /usr/libexec/git-core

📁 ..
📄 git(1.46 MB)
📄 git-add(1.46 MB)
📄 git-add--interactive(35.8 KB)
📄 git-am(21.84 KB)
📄 git-annotate(1.46 MB)
📄 git-apply(1.46 MB)
📄 git-archive(1.46 MB)
📄 git-bisect(11.71 KB)
📄 git-bisect--helper(1.46 MB)
📄 git-blame(1.46 MB)
📄 git-branch(1.46 MB)
📄 git-bundle(1.46 MB)
📄 git-cat-file(1.46 MB)
📄 git-check-attr(1.46 MB)
📄 git-check-ignore(1.46 MB)
📄 git-check-ref-format(1.46 MB)
📄 git-checkout(1.46 MB)
📄 git-checkout-index(1.46 MB)
📄 git-cherry(1.46 MB)
📄 git-cherry-pick(1.46 MB)
📄 git-clean(1.46 MB)
📄 git-clone(1.46 MB)
📄 git-column(1.46 MB)
📄 git-commit(1.46 MB)
📄 git-commit-tree(1.46 MB)
📄 git-config(1.46 MB)
📄 git-count-objects(1.46 MB)
📄 git-credential(1.46 MB)
📄 git-credential-cache(717.83 KB)
📄 git-credential-cache--daemon(730.32 KB)
📄 git-credential-store(726.01 KB)
📄 git-describe(1.46 MB)
📄 git-diff(1.46 MB)
📄 git-diff-files(1.46 MB)
📄 git-diff-index(1.46 MB)
📄 git-diff-tree(1.46 MB)
📄 git-difftool(13.41 KB)
📄 git-difftool--helper(1.86 KB)
📄 git-fast-export(1.46 MB)
📄 git-fast-import(754.91 KB)
📄 git-fetch(1.46 MB)
📄 git-fetch-pack(1.46 MB)
📄 git-filter-branch(11.33 KB)
📄 git-fmt-merge-msg(1.46 MB)
📄 git-for-each-ref(1.46 MB)
📄 git-format-patch(1.46 MB)
📄 git-fsck(1.46 MB)
📄 git-fsck-objects(1.46 MB)
📄 git-gc(1.46 MB)
📄 git-get-tar-commit-id(1.46 MB)
📄 git-grep(1.46 MB)
📄 git-hash-object(1.46 MB)
📄 git-help(1.46 MB)
📄 git-http-backend(730.63 KB)
📄 git-http-fetch(816.54 KB)
📄 git-http-push(832.82 KB)
📄 git-imap-send(738.79 KB)
📄 git-index-pack(1.46 MB)
📄 git-init(1.46 MB)
📄 git-init-db(1.46 MB)
📄 git-log(1.46 MB)
📄 git-lost-found(554 B)
📄 git-ls-files(1.46 MB)
📄 git-ls-remote(1.46 MB)
📄 git-ls-tree(1.46 MB)
📄 git-mailinfo(1.46 MB)
📄 git-mailsplit(1.46 MB)
📄 git-merge(1.46 MB)
📄 git-merge-base(1.46 MB)
📄 git-merge-file(1.46 MB)
📄 git-merge-index(1.46 MB)
📄 git-merge-octopus(2.16 KB)
📄 git-merge-one-file(3.4 KB)
📄 git-merge-ours(1.46 MB)
📄 git-merge-recursive(1.46 MB)
📄 git-merge-resolve(944 B)
📄 git-merge-subtree(1.46 MB)
📄 git-merge-tree(1.46 MB)
📄 git-mergetool(8.18 KB)
📄 git-mergetool--lib(7.6 KB)
📄 git-mktag(1.46 MB)
📄 git-mktree(1.46 MB)
📄 git-mv(1.46 MB)
📄 git-name-rev(1.46 MB)
📄 git-notes(1.46 MB)
📄 git-pack-objects(1.46 MB)
📄 git-pack-redundant(1.46 MB)
📄 git-pack-refs(1.46 MB)
📄 git-parse-remote(2.13 KB)
📄 git-patch-id(1.46 MB)
📄 git-peek-remote(1.46 MB)
📄 git-prune(1.46 MB)
📄 git-prune-packed(1.46 MB)
📄 git-pull(7.68 KB)
📄 git-push(1.46 MB)
📄 git-quiltimport(3.27 KB)
📄 git-read-tree(1.46 MB)
📄 git-rebase(13.26 KB)
📄 git-rebase--am(1.43 KB)
📄 git-rebase--interactive(25.09 KB)
📄 git-rebase--merge(3.01 KB)
📄 git-receive-pack(1.46 MB)
📄 git-reflog(1.46 MB)
📄 git-relink(4.09 KB)
📄 git-remote(1.46 MB)
📄 git-remote-ext(1.46 MB)
📄 git-remote-fd(1.46 MB)
📄 git-remote-ftp(824.59 KB)
📄 git-remote-ftps(824.59 KB)
📄 git-remote-http(824.59 KB)
📄 git-remote-https(824.59 KB)
📄 git-remote-testpy(7.26 KB)
📄 git-repack(4.87 KB)
📄 git-replace(1.46 MB)
📄 git-repo-config(1.46 MB)
📄 git-request-pull(3.57 KB)
📄 git-rerere(1.46 MB)
📄 git-reset(1.46 MB)
📄 git-rev-list(1.46 MB)
📄 git-rev-parse(1.46 MB)
📄 git-revert(1.46 MB)
📄 git-rm(1.46 MB)
📄 git-send-pack(1.46 MB)
📄 git-sh-i18n(1.92 KB)
📄 git-sh-i18n--envsubst(24.16 KB)
📄 git-sh-setup(6.32 KB)
📄 git-shell(722.04 KB)
📄 git-shortlog(1.46 MB)
📄 git-show(1.46 MB)
📄 git-show-branch(1.46 MB)
📄 git-show-index(717.8 KB)
📄 git-show-ref(1.46 MB)
📄 git-stage(1.46 MB)
📄 git-stash(12.61 KB)
📄 git-status(1.46 MB)
📄 git-stripspace(1.46 MB)
📄 git-submodule(30.31 KB)
📄 git-submodule--helper(1.46 MB)
📄 git-subtree(15.08 KB)
📄 git-symbolic-ref(1.46 MB)
📄 git-tag(1.46 MB)
📄 git-tar-tree(1.46 MB)
📄 git-unpack-file(1.46 MB)
📄 git-unpack-objects(1.46 MB)
📄 git-update-index(1.46 MB)
📄 git-update-ref(1.46 MB)
📄 git-update-server-info(1.46 MB)
📄 git-upload-archive(1.46 MB)
📄 git-upload-pack(795.48 KB)
📄 git-var(1.46 MB)
📄 git-verify-pack(1.46 MB)
📄 git-verify-tag(1.46 MB)
📄 git-web--browse(4.12 KB)
📄 git-whatchanged(1.46 MB)
📄 git-write-tree(1.46 MB)
📁 mergetools

Editing: git-merge-octopus

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

LF='
'

die () {
    echo >&2 "$*"
    exit 1
}

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

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.
		echo "Automated merge did not work."
		echo "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 "Unable to find common commit with $pretty_name"

case "$LF$common$LF" in
	*"$LF$SHA1$LF"*)
		echo "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.

echo "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

echo "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
		echo "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"

X7ROOT File Manager

Editing: git-merge-octopus

Upload File

Create Folder