404

[ Avaa Bypassed ]




Upload:

Command:

botdev@3.21.114.165: ~ $
#!/bin/sh
# git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
# This script is typically launched by using the 'git difftool'
# convenience command.
#
# Copyright (c) 2009, 2010 David Aguilar

TOOL_MODE=diff
. git-mergetool--lib

# difftool.prompt controls the default prompt/no-prompt behavior
# and is overridden with $GIT_DIFFTOOL*_PROMPT.
should_prompt () {
	prompt_merge=$(git config --bool mergetool.prompt || echo true)
	prompt=$(git config --bool difftool.prompt || echo $prompt_merge)
	if test "$prompt" = true
	then
		test -z "$GIT_DIFFTOOL_NO_PROMPT"
	else
		test -n "$GIT_DIFFTOOL_PROMPT"
	fi
}

# Indicates that --extcmd=... was specified
use_ext_cmd () {
	test -n "$GIT_DIFFTOOL_EXTCMD"
}

launch_merge_tool () {
	# Merged is the filename as it appears in the work tree
	# Local is the contents of a/filename
	# Remote is the contents of b/filename
	# Custom merge tool commands might use $BASE so we provide it
	MERGED="$1"
	LOCAL="$2"
	REMOTE="$3"
	BASE="$1"

	# $LOCAL and $REMOTE are temporary files so prompt
	# the user with the real $MERGED name before launching $merge_tool.
	if should_prompt
	then
		printf "\nViewing (%s/%s): '%s'\n" "$GIT_DIFF_PATH_COUNTER" \
			"$GIT_DIFF_PATH_TOTAL" "$MERGED"
		if use_ext_cmd
		then
			printf "Launch '%s' [Y/n]? " \
				"$GIT_DIFFTOOL_EXTCMD"
		else
			printf "Launch '%s' [Y/n]? " "$merge_tool"
		fi
		read ans || return
		if test "$ans" = n
		then
			return
		fi
	fi

	if use_ext_cmd
	then
		export BASE
		eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
	else
		run_merge_tool "$merge_tool"
	fi
}

if ! use_ext_cmd
then
	if test -n "$GIT_DIFF_TOOL"
	then
		merge_tool="$GIT_DIFF_TOOL"
	else
		merge_tool="$(get_merge_tool)" || exit
	fi
fi

if test -n "$GIT_DIFFTOOL_DIRDIFF"
then
	LOCAL="$1"
	REMOTE="$2"
	run_merge_tool "$merge_tool" false
else
	# Launch the merge tool on each path provided by 'git diff'
	while test $# -gt 6
	do
		launch_merge_tool "$1" "$2" "$5"
		status=$?
		if test $status -ge 126
		then
			# Command not found (127), not executable (126) or
			# exited via a signal (>= 128).
			exit $status
		fi

		if test "$status" != 0 &&
			test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
		then
			exit $status
		fi
		shift 7
	done
fi

exit 0

Filemanager

Name Type Size Permission Actions
mergetools Folder 0755
git File 2.27 MB 0755
git-add File 2.27 MB 0755
git-add--interactive File 42.89 KB 0755
git-am File 2.27 MB 0755
git-annotate File 2.27 MB 0755
git-apply File 2.27 MB 0755
git-archive File 2.27 MB 0755
git-bisect File 14.11 KB 0755
git-bisect--helper File 2.27 MB 0755
git-blame File 2.27 MB 0755
git-branch File 2.27 MB 0755
git-bundle File 2.27 MB 0755
git-cat-file File 2.27 MB 0755
git-check-attr File 2.27 MB 0755
git-check-ignore File 2.27 MB 0755
git-check-mailmap File 2.27 MB 0755
git-check-ref-format File 2.27 MB 0755
git-checkout File 2.27 MB 0755
git-checkout-index File 2.27 MB 0755
git-cherry File 2.27 MB 0755
git-cherry-pick File 2.27 MB 0755
git-clean File 2.27 MB 0755
git-clone File 2.27 MB 0755
git-column File 2.27 MB 0755
git-commit File 2.27 MB 0755
git-commit-tree File 2.27 MB 0755
git-config File 2.27 MB 0755
git-count-objects File 2.27 MB 0755
git-credential File 2.27 MB 0755
git-credential-cache File 1.26 MB 0755
git-credential-cache--daemon File 1.27 MB 0755
git-credential-store File 1.27 MB 0755
git-daemon File 1.28 MB 0755
git-describe File 2.27 MB 0755
git-diff File 2.27 MB 0755
git-diff-files File 2.27 MB 0755
git-diff-index File 2.27 MB 0755
git-diff-tree File 2.27 MB 0755
git-difftool File 2.27 MB 0755
git-difftool--helper File 2.19 KB 0755
git-fast-export File 2.27 MB 0755
git-fast-import File 1.3 MB 0755
git-fetch File 2.27 MB 0755
git-fetch-pack File 2.27 MB 0755
git-filter-branch File 15.17 KB 0755
git-fmt-merge-msg File 2.27 MB 0755
git-for-each-ref File 2.27 MB 0755
git-format-patch File 2.27 MB 0755
git-fsck File 2.27 MB 0755
git-fsck-objects File 2.27 MB 0755
git-gc File 2.27 MB 0755
git-get-tar-commit-id File 2.27 MB 0755
git-grep File 2.27 MB 0755
git-hash-object File 2.27 MB 0755
git-help File 2.27 MB 0755
git-http-backend File 1.27 MB 0755
git-http-fetch File 1.31 MB 0755
git-http-push File 1.32 MB 0755
git-imap-send File 1.32 MB 0755
git-index-pack File 2.27 MB 0755
git-init File 2.27 MB 0755
git-init-db File 2.27 MB 0755
git-instaweb File 18.11 KB 0755
git-interpret-trailers File 2.27 MB 0755
git-log File 2.27 MB 0755
git-ls-files File 2.27 MB 0755
git-ls-remote File 2.27 MB 0755
git-ls-tree File 2.27 MB 0755
git-mailinfo File 2.27 MB 0755
git-mailsplit File 2.27 MB 0755
git-merge File 2.27 MB 0755
git-merge-base File 2.27 MB 0755
git-merge-file File 2.27 MB 0755
git-merge-index File 2.27 MB 0755
git-merge-octopus File 2.42 KB 0755
git-merge-one-file File 3.62 KB 0755
git-merge-ours File 2.27 MB 0755
git-merge-recursive File 2.27 MB 0755
git-merge-resolve File 944 B 0755
git-merge-subtree File 2.27 MB 0755
git-merge-tree File 2.27 MB 0755
git-mergetool File 10.06 KB 0755
git-mergetool--lib File 8.66 KB 0644
git-mktag File 2.27 MB 0755
git-mktree File 2.27 MB 0755
git-mv File 2.27 MB 0755
git-name-rev File 2.27 MB 0755
git-notes File 2.27 MB 0755
git-pack-objects File 2.27 MB 0755
git-pack-redundant File 2.27 MB 0755
git-pack-refs File 2.27 MB 0755
git-parse-remote File 2.59 KB 0644
git-patch-id File 2.27 MB 0755
git-prune File 2.27 MB 0755
git-prune-packed File 2.27 MB 0755
git-pull File 2.27 MB 0755
git-push File 2.27 MB 0755
git-quiltimport File 3.51 KB 0755
git-read-tree File 2.27 MB 0755
git-rebase File 16.89 KB 0755
git-rebase--am File 2.62 KB 0644
git-rebase--helper File 2.27 MB 0755
git-rebase--interactive File 28.25 KB 0644
git-rebase--merge File 4 KB 0644
git-receive-pack File 2.27 MB 0755
git-reflog File 2.27 MB 0755
git-remote File 2.27 MB 0755
git-remote-ext File 2.27 MB 0755
git-remote-fd File 2.27 MB 0755
git-remote-ftp File 1.32 MB 0755
git-remote-ftps File 1.32 MB 0755
git-remote-http File 1.32 MB 0755
git-remote-https File 1.32 MB 0755
git-remote-testsvn File 1.28 MB 0755
git-repack File 2.27 MB 0755
git-replace File 2.27 MB 0755
git-request-pull File 3.61 KB 0755
git-rerere File 2.27 MB 0755
git-reset File 2.27 MB 0755
git-rev-list File 2.27 MB 0755
git-rev-parse File 2.27 MB 0755
git-revert File 2.27 MB 0755
git-rm File 2.27 MB 0755
git-send-pack File 2.27 MB 0755
git-sh-i18n File 2.3 KB 0644
git-sh-i18n--envsubst File 1.26 MB 0755
git-sh-prompt File 16 KB 0644
git-sh-setup File 9.04 KB 0644
git-shell File 1.26 MB 0755
git-shortlog File 2.27 MB 0755
git-show File 2.27 MB 0755
git-show-branch File 2.27 MB 0755
git-show-index File 1.26 MB 0755
git-show-ref File 2.27 MB 0755
git-stage File 2.27 MB 0755
git-stash File 15.12 KB 0755
git-status File 2.27 MB 0755
git-stripspace File 2.27 MB 0755
git-submodule File 23.38 KB 0755
git-submodule--helper File 2.27 MB 0755
git-subtree File 16.11 KB 0755
git-symbolic-ref File 2.27 MB 0755
git-tag File 2.27 MB 0755
git-unpack-file File 2.27 MB 0755
git-unpack-objects File 2.27 MB 0755
git-update-index File 2.27 MB 0755
git-update-ref File 2.27 MB 0755
git-update-server-info File 2.27 MB 0755
git-upload-archive File 2.27 MB 0755
git-upload-pack File 1.27 MB 0755
git-var File 2.27 MB 0755
git-verify-commit File 2.27 MB 0755
git-verify-pack File 2.27 MB 0755
git-verify-tag File 2.27 MB 0755
git-web--browse File 4.3 KB 0755
git-whatchanged File 2.27 MB 0755
git-worktree File 2.27 MB 0755
git-write-tree File 2.27 MB 0755