/usr/lib/git-core/
/usr/lib/git-core
NameSizeModeActions
mergetools/-0755rm
git37103600755editdlrm
git-add37103600755editdlrm
git-add--interactive477700755editdlrm
git-am37103600755editdlrm
git-annotate37103600755editdlrm
git-apply37103600755editdlrm
git-archive37103600755editdlrm
git-bisect21370755editdlrm
git-bisect--helper37103600755editdlrm
git-blame37103600755editdlrm
git-branch37103600755editdlrm
git-bugreport37103600755editdlrm
git-bundle37103600755editdlrm
git-cat-file37103600755editdlrm
git-check-attr37103600755editdlrm
git-check-ignore37103600755editdlrm
git-check-mailmap37103600755editdlrm
git-check-ref-format37103600755editdlrm
git-checkout37103600755editdlrm
git-checkout--worker37103600755editdlrm
git-checkout-index37103600755editdlrm
git-cherry37103600755editdlrm
git-cherry-pick37103600755editdlrm
git-clean37103600755editdlrm
git-clone37103600755editdlrm
git-column37103600755editdlrm
git-commit37103600755editdlrm
git-commit-graph37103600755editdlrm
git-commit-tree37103600755editdlrm
git-config37103600755editdlrm
git-count-objects37103600755editdlrm
git-credential37103600755editdlrm
git-credential-cache37103600755editdlrm
git-credential-cache--daemon37103600755editdlrm
git-credential-store37103600755editdlrm
git-daemon5946240755editdlrm
git-describe37103600755editdlrm
git-diff37103600755editdlrm
git-diff-files37103600755editdlrm
git-diff-index37103600755editdlrm
git-diff-tree37103600755editdlrm
git-difftool37103600755editdlrm
git-difftool--helper25030755editdlrm
git-env--helper37103600755editdlrm
git-fast-export37103600755editdlrm
git-fast-import37103600755editdlrm
git-fetch37103600755editdlrm
git-fetch-pack37103600755editdlrm
git-filter-branch158620755editdlrm
git-fmt-merge-msg37103600755editdlrm
git-for-each-ref37103600755editdlrm
git-for-each-repo37103600755editdlrm
git-format-patch37103600755editdlrm
git-fsck37103600755editdlrm
git-fsck-objects37103600755editdlrm
git-gc37103600755editdlrm
git-get-tar-commit-id37103600755editdlrm
git-grep37103600755editdlrm
git-hash-object37103600755editdlrm
git-help37103600755editdlrm
git-http-backend5948880755editdlrm
git-http-fetch6573760755editdlrm
git-http-push10040000755editdlrm
git-imap-send6407440755editdlrm
git-index-pack37103600755editdlrm
git-init37103600755editdlrm
git-init-db37103600755editdlrm
git-instaweb223620755editdlrm
git-interpret-trailers37103600755editdlrm
git-log37103600755editdlrm
git-ls-files37103600755editdlrm
git-ls-remote37103600755editdlrm
git-ls-tree37103600755editdlrm
git-mailinfo37103600755editdlrm
git-mailsplit37103600755editdlrm
git-maintenance37103600755editdlrm
git-merge37103600755editdlrm
git-merge-base37103600755editdlrm
git-merge-file37103600755editdlrm
git-merge-index37103600755editdlrm
git-merge-octopus24770755editdlrm
git-merge-one-file36950755editdlrm
git-merge-ours37103600755editdlrm
git-merge-recursive37103600755editdlrm
git-merge-resolve9440755editdlrm
git-merge-subtree37103600755editdlrm
git-merge-tree37103600755editdlrm
git-mergetool115640755editdlrm
git-mergetool--lib97720644editdlrm
git-mktag37103600755editdlrm
git-mktree37103600755editdlrm
git-multi-pack-index37103600755editdlrm
git-mv37103600755editdlrm
git-name-rev37103600755editdlrm
git-notes37103600755editdlrm
git-pack-objects37103600755editdlrm
git-pack-redundant37103600755editdlrm
git-pack-refs37103600755editdlrm
git-patch-id37103600755editdlrm
git-prune37103600755editdlrm
git-prune-packed37103600755editdlrm
git-pull37103600755editdlrm
git-push37103600755editdlrm
git-quiltimport36930755editdlrm
git-range-diff37103600755editdlrm
git-read-tree37103600755editdlrm
git-rebase37103600755editdlrm
git-receive-pack37103600755editdlrm
git-reflog37103600755editdlrm
git-remote37103600755editdlrm
git-remote-ext37103600755editdlrm
git-remote-fd37103600755editdlrm
git-remote-ftp6905440755editdlrm
git-remote-ftps6905440755editdlrm
git-remote-http6905440755editdlrm
git-remote-https6905440755editdlrm
git-repack37103600755editdlrm
git-replace37103600755editdlrm
git-request-pull41300755editdlrm
git-rerere37103600755editdlrm
git-reset37103600755editdlrm
git-restore37103600755editdlrm
git-rev-list37103600755editdlrm
git-rev-parse37103600755editdlrm
git-revert37103600755editdlrm
git-rm37103600755editdlrm
git-send-pack37103600755editdlrm
git-sh-i18n16830644editdlrm
git-sh-i18n--envsubst5656960755editdlrm
git-sh-prompt177810644editdlrm
git-sh-setup88770644editdlrm
git-shell5658400755editdlrm
git-shortlog37103600755editdlrm
git-show37103600755editdlrm
git-show-branch37103600755editdlrm
git-show-index37103600755editdlrm
git-show-ref37103600755editdlrm
git-sparse-checkout37103600755editdlrm
git-stage37103600755editdlrm
git-stash37103600755editdlrm
git-status37103600755editdlrm
git-stripspace37103600755editdlrm
git-submodule141020755editdlrm
git-submodule--helper37103600755editdlrm
git-subtree235700755editdlrm
git-switch37103600755editdlrm
git-symbolic-ref37103600755editdlrm
git-tag37103600755editdlrm
git-unpack-file37103600755editdlrm
git-unpack-objects37103600755editdlrm
git-update-index37103600755editdlrm
git-update-ref37103600755editdlrm
git-update-server-info37103600755editdlrm
git-upload-archive37103600755editdlrm
git-upload-pack37103600755editdlrm
git-var37103600755editdlrm
git-verify-commit37103600755editdlrm
git-verify-pack37103600755editdlrm
git-verify-tag37103600755editdlrm
git-web--browse44010755editdlrm
git-whatchanged37103600755editdlrm
git-worktree37103600755editdlrm
git-write-tree37103600755editdlrm
Edit: /usr/lib/git-core/git-difftool--helper (2503B)
#!/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 initialize_merge_tool "$merge_tool" # ignore the error from the above --- run_merge_tool # will diagnose unusable tool by itself 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)" fi fi if test -n "$GIT_DIFFTOOL_DIRDIFF" then LOCAL="$1" REMOTE="$2" initialize_merge_tool "$merge_tool" # ignore the error from the above --- run_merge_tool # will diagnose unusable tool by itself 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