#!/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'\n" "$MERGED" if use_ext_cmd then printf "Launch '%s' [Y/n]: " \ "$GIT_DIFFTOOL_EXTCMD" else printf "Launch '%s' [Y/n]: " "$merge_tool" fi if read ans && 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" shift 7 done fi
Name | Type | Size | Permission | Actions |
---|---|---|---|---|
mergetools | Folder | 0755 |
|
|
.git-add.40009 | File | 1.46 MB | 0755 |
|
.git-annotate.40009 | File | 1.46 MB | 0755 |
|
.git-apply.40009 | File | 1.46 MB | 0755 |
|
.git-archive.40009 | File | 1.46 MB | 0755 |
|
.git-bisect--helper.40009 | File | 1.46 MB | 0755 |
|
.git-blame.40009 | File | 1.46 MB | 0755 |
|
.git-branch.40009 | File | 1.46 MB | 0755 |
|
.git-bundle.40009 | File | 1.46 MB | 0755 |
|
.git-cat-file.40009 | File | 1.46 MB | 0755 |
|
.git-check-attr.40009 | File | 1.46 MB | 0755 |
|
.git-check-ignore.40009 | File | 1.46 MB | 0755 |
|
.git-check-ref-format.40009 | File | 1.46 MB | 0755 |
|
.git-checkout-index.40009 | File | 1.46 MB | 0755 |
|
.git-checkout.40009 | File | 1.46 MB | 0755 |
|
.git-cherry-pick.40009 | File | 1.46 MB | 0755 |
|
.git-cherry.40009 | File | 1.46 MB | 0755 |
|
.git-clean.40009 | File | 1.46 MB | 0755 |
|
.git-clone.40009 | File | 1.46 MB | 0755 |
|
.git-column.40009 | File | 1.46 MB | 0755 |
|
.git-commit-tree.40009 | File | 1.46 MB | 0755 |
|
.git-commit.40009 | File | 1.46 MB | 0755 |
|
.git-config.40009 | File | 1.46 MB | 0755 |
|
.git-count-objects.40009 | File | 1.46 MB | 0755 |
|
.git-credential.40009 | File | 1.46 MB | 0755 |
|
.git-describe.40009 | File | 1.46 MB | 0755 |
|
.git-diff-files.40009 | File | 1.46 MB | 0755 |
|
.git-diff-index.40009 | File | 1.46 MB | 0755 |
|
.git-diff-tree.40009 | File | 1.46 MB | 0755 |
|
.git-diff.40009 | File | 1.46 MB | 0755 |
|
.git-fast-export.40009 | File | 1.46 MB | 0755 |
|
.git-fetch-pack.40009 | File | 1.46 MB | 0755 |
|
.git-fetch.40009 | File | 1.46 MB | 0755 |
|
.git-fmt-merge-msg.40009 | File | 1.46 MB | 0755 |
|
.git-for-each-ref.40009 | File | 1.46 MB | 0755 |
|
.git-format-patch.40009 | File | 1.46 MB | 0755 |
|
.git-fsck-objects.40009 | File | 1.46 MB | 0755 |
|
.git-fsck.40009 | File | 1.46 MB | 0755 |
|
.git-gc.40009 | File | 1.46 MB | 0755 |
|
.git-get-tar-commit-id.40009 | File | 1.46 MB | 0755 |
|
.git-grep.40009 | File | 1.46 MB | 0755 |
|
.git-hash-object.40009 | File | 1.46 MB | 0755 |
|
.git-help.40009 | File | 1.46 MB | 0755 |
|
.git-index-pack.40009 | File | 1.46 MB | 0755 |
|
.git-init-db.40009 | File | 1.46 MB | 0755 |
|
.git-init.40009 | File | 1.46 MB | 0755 |
|
.git-log.40009 | File | 1.46 MB | 0755 |
|
.git-ls-files.40009 | File | 1.46 MB | 0755 |
|
.git-ls-remote.40009 | File | 1.46 MB | 0755 |
|
.git-ls-tree.40009 | File | 1.46 MB | 0755 |
|
.git-mailinfo.40009 | File | 1.46 MB | 0755 |
|
.git-mailsplit.40009 | File | 1.46 MB | 0755 |
|
.git-merge-base.40009 | File | 1.46 MB | 0755 |
|
.git-merge-file.40009 | File | 1.46 MB | 0755 |
|
.git-merge-index.40009 | File | 1.46 MB | 0755 |
|
.git-merge-ours.40009 | File | 1.46 MB | 0755 |
|
.git-merge-recursive.40009 | File | 1.46 MB | 0755 |
|
.git-merge-subtree.40009 | File | 1.46 MB | 0755 |
|
.git-merge-tree.40009 | File | 1.46 MB | 0755 |
|
.git-merge.40009 | File | 1.46 MB | 0755 |
|
.git-mktag.40009 | File | 1.46 MB | 0755 |
|
.git-mktree.40009 | File | 1.46 MB | 0755 |
|
.git-mv.40009 | File | 1.46 MB | 0755 |
|
.git-name-rev.40009 | File | 1.46 MB | 0755 |
|
.git-notes.40009 | File | 1.46 MB | 0755 |
|
.git-pack-objects.40009 | File | 1.46 MB | 0755 |
|
.git-pack-redundant.40009 | File | 1.46 MB | 0755 |
|
.git-pack-refs.40009 | File | 1.46 MB | 0755 |
|
.git-patch-id.40009 | File | 1.46 MB | 0755 |
|
.git-peek-remote.40009 | File | 1.46 MB | 0755 |
|
.git-prune-packed.40009 | File | 1.46 MB | 0755 |
|
.git-prune.40009 | File | 1.46 MB | 0755 |
|
.git-push.40009 | File | 1.46 MB | 0755 |
|
.git-read-tree.40009 | File | 1.46 MB | 0755 |
|
.git-receive-pack.40009 | File | 1.46 MB | 0755 |
|
.git-reflog.40009 | File | 1.46 MB | 0755 |
|
.git-remote-ext.40009 | File | 1.46 MB | 0755 |
|
.git-remote-fd.40009 | File | 1.46 MB | 0755 |
|
.git-remote-ftps.40009 | File | 820.52 KB | 0755 |
|
.git-remote-http.40009 | File | 820.52 KB | 0755 |
|
.git-remote-https.40009 | File | 820.52 KB | 0755 |
|
.git-remote.40009 | File | 1.46 MB | 0755 |
|
.git-replace.40009 | File | 1.46 MB | 0755 |
|
.git-repo-config.40009 | File | 1.46 MB | 0755 |
|
.git-rerere.40009 | File | 1.46 MB | 0755 |
|
.git-reset.40009 | File | 1.46 MB | 0755 |
|
.git-rev-list.40009 | File | 1.46 MB | 0755 |
|
.git-rev-parse.40009 | File | 1.46 MB | 0755 |
|
.git-revert.40009 | File | 1.46 MB | 0755 |
|
.git-rm.40009 | File | 1.46 MB | 0755 |
|
.git-send-pack.40009 | File | 1.46 MB | 0755 |
|
.git-shell.40009 | File | 717.95 KB | 0755 |
|
.git-shortlog.40009 | File | 1.46 MB | 0755 |
|
.git-show-branch.40009 | File | 1.46 MB | 0755 |
|
.git-show-ref.40009 | File | 1.46 MB | 0755 |
|
.git-show.40009 | File | 1.46 MB | 0755 |
|
.git-stage.40009 | File | 1.46 MB | 0755 |
|
.git-status.40009 | File | 1.46 MB | 0755 |
|
.git-stripspace.40009 | File | 1.46 MB | 0755 |
|
.git-submodule--helper.40009 | File | 1.46 MB | 0755 |
|
.git-symbolic-ref.40009 | File | 1.46 MB | 0755 |
|
.git-tag.40009 | File | 1.46 MB | 0755 |
|
.git-tar-tree.40009 | File | 1.46 MB | 0755 |
|
.git-unpack-file.40009 | File | 1.46 MB | 0755 |
|
.git-unpack-objects.40009 | File | 1.46 MB | 0755 |
|
.git-update-index.40009 | File | 1.46 MB | 0755 |
|
.git-update-ref.40009 | File | 1.46 MB | 0755 |
|
.git-update-server-info.40009 | File | 1.46 MB | 0755 |
|
.git-upload-archive.40009 | File | 1.46 MB | 0755 |
|
.git-upload-pack.40009 | File | 791.44 KB | 0755 |
|
.git-var.40009 | File | 1.46 MB | 0755 |
|
.git-verify-pack.40009 | File | 1.46 MB | 0755 |
|
.git-verify-tag.40009 | File | 1.46 MB | 0755 |
|
.git-whatchanged.40009 | File | 1.46 MB | 0755 |
|
.git-write-tree.40009 | File | 1.46 MB | 0755 |
|
.git.40009 | File | 1.46 MB | 0755 |
|
git | File | 1.46 MB | 0755 |
|
git-add | File | 1.46 MB | 0755 |
|
git-add--interactive | File | 35.8 KB | 0755 |
|
git-am | File | 21.84 KB | 0755 |
|
git-annotate | File | 1.46 MB | 0755 |
|
git-apply | File | 1.46 MB | 0755 |
|
git-archive | File | 1.46 MB | 0755 |
|
git-bisect | File | 11.71 KB | 0755 |
|
git-bisect--helper | File | 1.46 MB | 0755 |
|
git-blame | File | 1.46 MB | 0755 |
|
git-branch | File | 1.46 MB | 0755 |
|
git-bundle | File | 1.46 MB | 0755 |
|
git-cat-file | File | 1.46 MB | 0755 |
|
git-check-attr | File | 1.46 MB | 0755 |
|
git-check-ignore | File | 1.46 MB | 0755 |
|
git-check-ref-format | File | 1.46 MB | 0755 |
|
git-checkout | File | 1.46 MB | 0755 |
|
git-checkout-index | File | 1.46 MB | 0755 |
|
git-cherry | File | 1.46 MB | 0755 |
|
git-cherry-pick | File | 1.46 MB | 0755 |
|
git-clean | File | 1.46 MB | 0755 |
|
git-clone | File | 1.46 MB | 0755 |
|
git-column | File | 1.46 MB | 0755 |
|
git-commit | File | 1.46 MB | 0755 |
|
git-commit-tree | File | 1.46 MB | 0755 |
|
git-config | File | 1.46 MB | 0755 |
|
git-count-objects | File | 1.46 MB | 0755 |
|
git-credential | File | 1.46 MB | 0755 |
|
git-credential-cache | File | 717.83 KB | 0755 |
|
git-credential-cache--daemon | File | 730.32 KB | 0755 |
|
git-credential-store | File | 726.01 KB | 0755 |
|
git-describe | File | 1.46 MB | 0755 |
|
git-diff | File | 1.46 MB | 0755 |
|
git-diff-files | File | 1.46 MB | 0755 |
|
git-diff-index | File | 1.46 MB | 0755 |
|
git-diff-tree | File | 1.46 MB | 0755 |
|
git-difftool | File | 13.41 KB | 0755 |
|
git-difftool--helper | File | 1.86 KB | 0755 |
|
git-fast-export | File | 1.46 MB | 0755 |
|
git-fast-import | File | 754.91 KB | 0755 |
|
git-fetch | File | 1.46 MB | 0755 |
|
git-fetch-pack | File | 1.46 MB | 0755 |
|
git-filter-branch | File | 11.33 KB | 0755 |
|
git-fmt-merge-msg | File | 1.46 MB | 0755 |
|
git-for-each-ref | File | 1.46 MB | 0755 |
|
git-format-patch | File | 1.46 MB | 0755 |
|
git-fsck | File | 1.46 MB | 0755 |
|
git-fsck-objects | File | 1.46 MB | 0755 |
|
git-gc | File | 1.46 MB | 0755 |
|
git-get-tar-commit-id | File | 1.46 MB | 0755 |
|
git-grep | File | 1.46 MB | 0755 |
|
git-hash-object | File | 1.46 MB | 0755 |
|
git-help | File | 1.46 MB | 0755 |
|
git-http-backend | File | 730.63 KB | 0755 |
|
git-http-fetch | File | 816.54 KB | 0755 |
|
git-http-push | File | 832.82 KB | 0755 |
|
git-imap-send | File | 738.79 KB | 0755 |
|
git-index-pack | File | 1.46 MB | 0755 |
|
git-init | File | 1.46 MB | 0755 |
|
git-init-db | File | 1.46 MB | 0755 |
|
git-log | File | 1.46 MB | 0755 |
|
git-lost-found | File | 554 B | 0755 |
|
git-ls-files | File | 1.46 MB | 0755 |
|
git-ls-remote | File | 1.46 MB | 0755 |
|
git-ls-tree | File | 1.46 MB | 0755 |
|
git-mailinfo | File | 1.46 MB | 0755 |
|
git-mailsplit | File | 1.46 MB | 0755 |
|
git-merge | File | 1.46 MB | 0755 |
|
git-merge-base | File | 1.46 MB | 0755 |
|
git-merge-file | File | 1.46 MB | 0755 |
|
git-merge-index | File | 1.46 MB | 0755 |
|
git-merge-octopus | File | 2.16 KB | 0755 |
|
git-merge-one-file | File | 3.4 KB | 0755 |
|
git-merge-ours | File | 1.46 MB | 0755 |
|
git-merge-recursive | File | 1.46 MB | 0755 |
|
git-merge-resolve | File | 944 B | 0755 |
|
git-merge-subtree | File | 1.46 MB | 0755 |
|
git-merge-tree | File | 1.46 MB | 0755 |
|
git-mergetool | File | 8.18 KB | 0755 |
|
git-mergetool--lib | File | 7.6 KB | 0644 |
|
git-mktag | File | 1.46 MB | 0755 |
|
git-mktree | File | 1.46 MB | 0755 |
|
git-mv | File | 1.46 MB | 0755 |
|
git-name-rev | File | 1.46 MB | 0755 |
|
git-notes | File | 1.46 MB | 0755 |
|
git-pack-objects | File | 1.46 MB | 0755 |
|
git-pack-redundant | File | 1.46 MB | 0755 |
|
git-pack-refs | File | 1.46 MB | 0755 |
|
git-parse-remote | File | 2.13 KB | 0644 |
|
git-patch-id | File | 1.46 MB | 0755 |
|
git-peek-remote | File | 1.46 MB | 0755 |
|
git-prune | File | 1.46 MB | 0755 |
|
git-prune-packed | File | 1.46 MB | 0755 |
|
git-pull | File | 7.68 KB | 0755 |
|
git-push | File | 1.46 MB | 0755 |
|
git-quiltimport | File | 3.27 KB | 0755 |
|
git-read-tree | File | 1.46 MB | 0755 |
|
git-rebase | File | 13.26 KB | 0755 |
|
git-rebase--am | File | 1.43 KB | 0644 |
|
git-rebase--interactive | File | 25.09 KB | 0644 |
|
git-rebase--merge | File | 3.01 KB | 0644 |
|
git-receive-pack | File | 1.46 MB | 0755 |
|
git-reflog | File | 1.46 MB | 0755 |
|
git-relink | File | 4.09 KB | 0755 |
|
git-remote | File | 1.46 MB | 0755 |
|
git-remote-ext | File | 1.46 MB | 0755 |
|
git-remote-fd | File | 1.46 MB | 0755 |
|
git-remote-ftp | File | 824.59 KB | 0755 |
|
git-remote-ftps | File | 824.59 KB | 0755 |
|
git-remote-http | File | 824.59 KB | 0755 |
|
git-remote-https | File | 824.59 KB | 0755 |
|
git-remote-testpy | File | 7.26 KB | 0755 |
|
git-repack | File | 4.87 KB | 0755 |
|
git-replace | File | 1.46 MB | 0755 |
|
git-repo-config | File | 1.46 MB | 0755 |
|
git-request-pull | File | 3.57 KB | 0755 |
|
git-rerere | File | 1.46 MB | 0755 |
|
git-reset | File | 1.46 MB | 0755 |
|
git-rev-list | File | 1.46 MB | 0755 |
|
git-rev-parse | File | 1.46 MB | 0755 |
|
git-revert | File | 1.46 MB | 0755 |
|
git-rm | File | 1.46 MB | 0755 |
|
git-send-pack | File | 1.46 MB | 0755 |
|
git-sh-i18n | File | 1.92 KB | 0644 |
|
git-sh-i18n--envsubst | File | 24.16 KB | 0755 |
|
git-sh-setup | File | 6.32 KB | 0644 |
|
git-shell | File | 722.04 KB | 0755 |
|
git-shortlog | File | 1.46 MB | 0755 |
|
git-show | File | 1.46 MB | 0755 |
|
git-show-branch | File | 1.46 MB | 0755 |
|
git-show-index | File | 717.8 KB | 0755 |
|
git-show-ref | File | 1.46 MB | 0755 |
|
git-stage | File | 1.46 MB | 0755 |
|
git-stash | File | 12.61 KB | 0755 |
|
git-status | File | 1.46 MB | 0755 |
|
git-stripspace | File | 1.46 MB | 0755 |
|
git-submodule | File | 30.31 KB | 0755 |
|
git-submodule--helper | File | 1.46 MB | 0755 |
|
git-subtree | File | 15.08 KB | 0755 |
|
git-symbolic-ref | File | 1.46 MB | 0755 |
|
git-tag | File | 1.46 MB | 0755 |
|
git-tar-tree | File | 1.46 MB | 0755 |
|
git-unpack-file | File | 1.46 MB | 0755 |
|
git-unpack-objects | File | 1.46 MB | 0755 |
|
git-update-index | File | 1.46 MB | 0755 |
|
git-update-ref | File | 1.46 MB | 0755 |
|
git-update-server-info | File | 1.46 MB | 0755 |
|
git-upload-archive | File | 1.46 MB | 0755 |
|
git-upload-pack | File | 795.48 KB | 0755 |
|
git-var | File | 1.46 MB | 0755 |
|
git-verify-pack | File | 1.46 MB | 0755 |
|
git-verify-tag | File | 1.46 MB | 0755 |
|
git-web--browse | File | 4.12 KB | 0755 |
|
git-whatchanged | File | 1.46 MB | 0755 |
|
git-write-tree | File | 1.46 MB | 0755 |
|