/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-merge-one-file (3695B)
#!/bin/sh # # Copyright (c) Linus Torvalds, 2005 # # This is the git per-file merge script, called with # # $1 - original file SHA1 (or empty) # $2 - file in branch1 SHA1 (or empty) # $3 - file in branch2 SHA1 (or empty) # $4 - pathname in repository # $5 - original file mode (or empty) # $6 - file in branch1 mode (or empty) # $7 - file in branch2 mode (or empty) # # Handle some trivial cases.. The _really_ trivial cases have # been handled already by git read-tree, but that one doesn't # do any merges that might change the tree layout. USAGE=' ' USAGE="$USAGE " LONG_USAGE="usage: git merge-one-file $USAGE Blob ids and modes should be empty for missing files." SUBDIRECTORY_OK=Yes . git-sh-setup cd_to_toplevel require_work_tree if test $# != 7 then echo "$LONG_USAGE" exit 1 fi case "${1:-.}${2:-.}${3:-.}" in # # Deleted in both or deleted in one and unchanged in the other # "$1.." | "$1.$1" | "$1$1.") if { test -z "$6" && test "$5" != "$7"; } || { test -z "$7" && test "$5" != "$6"; } then echo "ERROR: File $4 deleted on one branch but had its" >&2 echo "ERROR: permissions changed on the other." >&2 exit 1 fi if test -n "$2" then echo "Removing $4" else # read-tree checked that index matches HEAD already, # so we know we do not have this path tracked. # there may be an unrelated working tree file here, # which we should just leave unmolested. Make sure # we do not have it in the index, though. exec git update-index --remove -- "$4" fi if test -f "$4" then rm -f -- "$4" && rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || : fi && exec git update-index --remove -- "$4" ;; # # Added in one. # ".$2.") # the other side did not add and we added so there is nothing # to be done, except making the path merged. exec git update-index --add --cacheinfo "$6" "$2" "$4" ;; "..$3") echo "Adding $4" if test -f "$4" then echo "ERROR: untracked $4 is overwritten by the merge." >&2 exit 1 fi git update-index --add --cacheinfo "$7" "$3" "$4" && exec git checkout-index -u -f -- "$4" ;; # # Added in both, identically (check for same permissions). # ".$3$2") if test "$6" != "$7" then echo "ERROR: File $4 added identically in both branches," >&2 echo "ERROR: but permissions conflict $6->$7." >&2 exit 1 fi echo "Adding $4" git update-index --add --cacheinfo "$6" "$2" "$4" && exec git checkout-index -u -f -- "$4" ;; # # Modified in both, but differently. # "$1$2$3" | ".$2$3") case ",$6,$7," in *,120000,*) echo "ERROR: $4: Not merging symbolic link changes." >&2 exit 1 ;; *,160000,*) echo "ERROR: $4: Not merging conflicting submodule changes." >&2 exit 1 ;; esac src1=$(git unpack-file $2) src2=$(git unpack-file $3) case "$1" in '') echo "Added $4 in both, but differently." orig=$(git unpack-file $(git hash-object /dev/null)) ;; *) echo "Auto-merging $4" orig=$(git unpack-file $1) ;; esac git merge-file "$src1" "$orig" "$src2" ret=$? msg= if test $ret != 0 || test -z "$1" then msg='content conflict' ret=1 fi # Create the working tree file, using "our tree" version from the # index, and then store the result of the merge. git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" || exit 1 rm -f -- "$orig" "$src1" "$src2" if test "$6" != "$7" then if test -n "$msg" then msg="$msg, " fi msg="${msg}permissions conflict: $5->$6,$7" ret=1 fi if test $ret != 0 then echo "ERROR: $msg in $4" >&2 exit 1 fi exec git update-index -- "$4" ;; *) echo "ERROR: $4: Not handling case $1 -> $2 -> $3" >&2 ;; esac exit 1