/
usr
/
lib
/
git-core
/
/usr/lib/git-core
mkdir
upload
Name
Size
Mode
Actions
mergetools/
-
0755
rm
git
3710360
0755
edit
dl
rm
git-add
3710360
0755
edit
dl
rm
git-add--interactive
47770
0755
edit
dl
rm
git-am
3710360
0755
edit
dl
rm
git-annotate
3710360
0755
edit
dl
rm
git-apply
3710360
0755
edit
dl
rm
git-archive
3710360
0755
edit
dl
rm
git-bisect
2137
0755
edit
dl
rm
git-bisect--helper
3710360
0755
edit
dl
rm
git-blame
3710360
0755
edit
dl
rm
git-branch
3710360
0755
edit
dl
rm
git-bugreport
3710360
0755
edit
dl
rm
git-bundle
3710360
0755
edit
dl
rm
git-cat-file
3710360
0755
edit
dl
rm
git-check-attr
3710360
0755
edit
dl
rm
git-check-ignore
3710360
0755
edit
dl
rm
git-check-mailmap
3710360
0755
edit
dl
rm
git-check-ref-format
3710360
0755
edit
dl
rm
git-checkout
3710360
0755
edit
dl
rm
git-checkout--worker
3710360
0755
edit
dl
rm
git-checkout-index
3710360
0755
edit
dl
rm
git-cherry
3710360
0755
edit
dl
rm
git-cherry-pick
3710360
0755
edit
dl
rm
git-clean
3710360
0755
edit
dl
rm
git-clone
3710360
0755
edit
dl
rm
git-column
3710360
0755
edit
dl
rm
git-commit
3710360
0755
edit
dl
rm
git-commit-graph
3710360
0755
edit
dl
rm
git-commit-tree
3710360
0755
edit
dl
rm
git-config
3710360
0755
edit
dl
rm
git-count-objects
3710360
0755
edit
dl
rm
git-credential
3710360
0755
edit
dl
rm
git-credential-cache
3710360
0755
edit
dl
rm
git-credential-cache--daemon
3710360
0755
edit
dl
rm
git-credential-store
3710360
0755
edit
dl
rm
git-daemon
594624
0755
edit
dl
rm
git-describe
3710360
0755
edit
dl
rm
git-diff
3710360
0755
edit
dl
rm
git-diff-files
3710360
0755
edit
dl
rm
git-diff-index
3710360
0755
edit
dl
rm
git-diff-tree
3710360
0755
edit
dl
rm
git-difftool
3710360
0755
edit
dl
rm
git-difftool--helper
2503
0755
edit
dl
rm
git-env--helper
3710360
0755
edit
dl
rm
git-fast-export
3710360
0755
edit
dl
rm
git-fast-import
3710360
0755
edit
dl
rm
git-fetch
3710360
0755
edit
dl
rm
git-fetch-pack
3710360
0755
edit
dl
rm
git-filter-branch
15862
0755
edit
dl
rm
git-fmt-merge-msg
3710360
0755
edit
dl
rm
git-for-each-ref
3710360
0755
edit
dl
rm
git-for-each-repo
3710360
0755
edit
dl
rm
git-format-patch
3710360
0755
edit
dl
rm
git-fsck
3710360
0755
edit
dl
rm
git-fsck-objects
3710360
0755
edit
dl
rm
git-gc
3710360
0755
edit
dl
rm
git-get-tar-commit-id
3710360
0755
edit
dl
rm
git-grep
3710360
0755
edit
dl
rm
git-hash-object
3710360
0755
edit
dl
rm
git-help
3710360
0755
edit
dl
rm
git-http-backend
594888
0755
edit
dl
rm
git-http-fetch
657376
0755
edit
dl
rm
git-http-push
1004000
0755
edit
dl
rm
git-imap-send
640744
0755
edit
dl
rm
git-index-pack
3710360
0755
edit
dl
rm
git-init
3710360
0755
edit
dl
rm
git-init-db
3710360
0755
edit
dl
rm
git-instaweb
22362
0755
edit
dl
rm
git-interpret-trailers
3710360
0755
edit
dl
rm
git-log
3710360
0755
edit
dl
rm
git-ls-files
3710360
0755
edit
dl
rm
git-ls-remote
3710360
0755
edit
dl
rm
git-ls-tree
3710360
0755
edit
dl
rm
git-mailinfo
3710360
0755
edit
dl
rm
git-mailsplit
3710360
0755
edit
dl
rm
git-maintenance
3710360
0755
edit
dl
rm
git-merge
3710360
0755
edit
dl
rm
git-merge-base
3710360
0755
edit
dl
rm
git-merge-file
3710360
0755
edit
dl
rm
git-merge-index
3710360
0755
edit
dl
rm
git-merge-octopus
2477
0755
edit
dl
rm
git-merge-one-file
3695
0755
edit
dl
rm
git-merge-ours
3710360
0755
edit
dl
rm
git-merge-recursive
3710360
0755
edit
dl
rm
git-merge-resolve
944
0755
edit
dl
rm
git-merge-subtree
3710360
0755
edit
dl
rm
git-merge-tree
3710360
0755
edit
dl
rm
git-mergetool
11564
0755
edit
dl
rm
git-mergetool--lib
9772
0644
edit
dl
rm
git-mktag
3710360
0755
edit
dl
rm
git-mktree
3710360
0755
edit
dl
rm
git-multi-pack-index
3710360
0755
edit
dl
rm
git-mv
3710360
0755
edit
dl
rm
git-name-rev
3710360
0755
edit
dl
rm
git-notes
3710360
0755
edit
dl
rm
git-pack-objects
3710360
0755
edit
dl
rm
git-pack-redundant
3710360
0755
edit
dl
rm
git-pack-refs
3710360
0755
edit
dl
rm
git-patch-id
3710360
0755
edit
dl
rm
git-prune
3710360
0755
edit
dl
rm
git-prune-packed
3710360
0755
edit
dl
rm
git-pull
3710360
0755
edit
dl
rm
git-push
3710360
0755
edit
dl
rm
git-quiltimport
3693
0755
edit
dl
rm
git-range-diff
3710360
0755
edit
dl
rm
git-read-tree
3710360
0755
edit
dl
rm
git-rebase
3710360
0755
edit
dl
rm
git-receive-pack
3710360
0755
edit
dl
rm
git-reflog
3710360
0755
edit
dl
rm
git-remote
3710360
0755
edit
dl
rm
git-remote-ext
3710360
0755
edit
dl
rm
git-remote-fd
3710360
0755
edit
dl
rm
git-remote-ftp
690544
0755
edit
dl
rm
git-remote-ftps
690544
0755
edit
dl
rm
git-remote-http
690544
0755
edit
dl
rm
git-remote-https
690544
0755
edit
dl
rm
git-repack
3710360
0755
edit
dl
rm
git-replace
3710360
0755
edit
dl
rm
git-request-pull
4130
0755
edit
dl
rm
git-rerere
3710360
0755
edit
dl
rm
git-reset
3710360
0755
edit
dl
rm
git-restore
3710360
0755
edit
dl
rm
git-rev-list
3710360
0755
edit
dl
rm
git-rev-parse
3710360
0755
edit
dl
rm
git-revert
3710360
0755
edit
dl
rm
git-rm
3710360
0755
edit
dl
rm
git-send-pack
3710360
0755
edit
dl
rm
git-sh-i18n
1683
0644
edit
dl
rm
git-sh-i18n--envsubst
565696
0755
edit
dl
rm
git-sh-prompt
17781
0644
edit
dl
rm
git-sh-setup
8877
0644
edit
dl
rm
git-shell
565840
0755
edit
dl
rm
git-shortlog
3710360
0755
edit
dl
rm
git-show
3710360
0755
edit
dl
rm
git-show-branch
3710360
0755
edit
dl
rm
git-show-index
3710360
0755
edit
dl
rm
git-show-ref
3710360
0755
edit
dl
rm
git-sparse-checkout
3710360
0755
edit
dl
rm
git-stage
3710360
0755
edit
dl
rm
git-stash
3710360
0755
edit
dl
rm
git-status
3710360
0755
edit
dl
rm
git-stripspace
3710360
0755
edit
dl
rm
git-submodule
14102
0755
edit
dl
rm
git-submodule--helper
3710360
0755
edit
dl
rm
git-subtree
23570
0755
edit
dl
rm
git-switch
3710360
0755
edit
dl
rm
git-symbolic-ref
3710360
0755
edit
dl
rm
git-tag
3710360
0755
edit
dl
rm
git-unpack-file
3710360
0755
edit
dl
rm
git-unpack-objects
3710360
0755
edit
dl
rm
git-update-index
3710360
0755
edit
dl
rm
git-update-ref
3710360
0755
edit
dl
rm
git-update-server-info
3710360
0755
edit
dl
rm
git-upload-archive
3710360
0755
edit
dl
rm
git-upload-pack
3710360
0755
edit
dl
rm
git-var
3710360
0755
edit
dl
rm
git-verify-commit
3710360
0755
edit
dl
rm
git-verify-pack
3710360
0755
edit
dl
rm
git-verify-tag
3710360
0755
edit
dl
rm
git-web--browse
4401
0755
edit
dl
rm
git-whatchanged
3710360
0755
edit
dl
rm
git-worktree
3710360
0755
edit
dl
rm
git-write-tree
3710360
0755
edit
dl
rm
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
Save
cmd:
run