File Manager

X7ROOT File Manager

Current Path: /usr/libexec/git-core

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

Editing: git-merge-octopus

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

X7ROOT File Manager

Editing: git-merge-octopus

Upload File

Create Folder