/usr/libexec/git-core/
/usr/libexec/git-core
NameSizeModeActions
mergetools/-0755rm
git38459280755editdlrm
git-add38459280755editdlrm
git-am38459280755editdlrm
git-annotate38459280755editdlrm
git-apply38459280755editdlrm
git-archive38459280755editdlrm
git-bisect38459280755editdlrm
git-blame38459280755editdlrm
git-branch38459280755editdlrm
git-bugreport38459280755editdlrm
git-bundle38459280755editdlrm
git-cat-file38459280755editdlrm
git-check-attr38459280755editdlrm
git-check-ignore38459280755editdlrm
git-check-mailmap38459280755editdlrm
git-check-ref-format38459280755editdlrm
git-checkout38459280755editdlrm
git-checkout--worker38459280755editdlrm
git-checkout-index38459280755editdlrm
git-cherry38459280755editdlrm
git-cherry-pick38459280755editdlrm
git-clean38459280755editdlrm
git-clone38459280755editdlrm
git-column38459280755editdlrm
git-commit38459280755editdlrm
git-commit-graph38459280755editdlrm
git-commit-tree38459280755editdlrm
git-config38459280755editdlrm
git-contacts45090755editdlrm
git-count-objects38459280755editdlrm
git-credential38459280755editdlrm
git-credential-cache38459280755editdlrm
git-credential-cache--daemon38459280755editdlrm
git-credential-netrc109450755editdlrm
git-credential-store38459280755editdlrm
git-describe38459280755editdlrm
git-diagnose38459280755editdlrm
git-diff38459280755editdlrm
git-diff-files38459280755editdlrm
git-diff-index38459280755editdlrm
git-diff-tree38459280755editdlrm
git-difftool38459280755editdlrm
git-difftool--helper26090755editdlrm
git-fast-export38459280755editdlrm
git-fast-import38459280755editdlrm
git-fetch38459280755editdlrm
git-fetch-pack38459280755editdlrm
git-filter-branch158570755editdlrm
git-fmt-merge-msg38459280755editdlrm
git-for-each-ref38459280755editdlrm
git-for-each-repo38459280755editdlrm
git-format-patch38459280755editdlrm
git-fsck38459280755editdlrm
git-fsck-objects38459280755editdlrm
git-fsmonitor--daemon38459280755editdlrm
git-gc38459280755editdlrm
git-get-tar-commit-id38459280755editdlrm
git-grep38459280755editdlrm
git-hash-object38459280755editdlrm
git-help38459280755editdlrm
git-hook38459280755editdlrm
git-http-backend22494080755editdlrm
git-http-fetch22832240755editdlrm
git-http-push22914480755editdlrm
git-imap-send22921040755editdlrm
git-index-pack38459280755editdlrm
git-init38459280755editdlrm
git-init-db38459280755editdlrm
git-interpret-trailers38459280755editdlrm
git-log38459280755editdlrm
git-ls-files38459280755editdlrm
git-ls-remote38459280755editdlrm
git-ls-tree38459280755editdlrm
git-mailinfo38459280755editdlrm
git-mailsplit38459280755editdlrm
git-maintenance38459280755editdlrm
git-merge38459280755editdlrm
git-merge-base38459280755editdlrm
git-merge-file38459280755editdlrm
git-merge-index38459280755editdlrm
git-merge-octopus24770755editdlrm
git-merge-one-file36950755editdlrm
git-merge-ours38459280755editdlrm
git-merge-recursive38459280755editdlrm
git-merge-resolve12260755editdlrm
git-merge-subtree38459280755editdlrm
git-merge-tree38459280755editdlrm
git-mergetool116930755editdlrm
git-mergetool--lib107280644editdlrm
git-mktag38459280755editdlrm
git-mktree38459280755editdlrm
git-multi-pack-index38459280755editdlrm
git-mv38459280755editdlrm
git-name-rev38459280755editdlrm
git-notes38459280755editdlrm
git-pack-objects38459280755editdlrm
git-pack-redundant38459280755editdlrm
git-pack-refs38459280755editdlrm
git-patch-id38459280755editdlrm
git-prune38459280755editdlrm
git-prune-packed38459280755editdlrm
git-pull38459280755editdlrm
git-push38459280755editdlrm
git-quiltimport36930755editdlrm
git-range-diff38459280755editdlrm
git-read-tree38459280755editdlrm
git-rebase38459280755editdlrm
git-receive-pack38459280755editdlrm
git-reflog38459280755editdlrm
git-remote38459280755editdlrm
git-remote-ext38459280755editdlrm
git-remote-fd38459280755editdlrm
git-remote-ftp22996640755editdlrm
git-remote-ftps22996640755editdlrm
git-remote-http22996640755editdlrm
git-remote-https22996640755editdlrm
git-repack38459280755editdlrm
git-replace38459280755editdlrm
git-request-pull41470755editdlrm
git-rerere38459280755editdlrm
git-reset38459280755editdlrm
git-restore38459280755editdlrm
git-rev-list38459280755editdlrm
git-rev-parse38459280755editdlrm
git-revert38459280755editdlrm
git-rm38459280755editdlrm
git-send-pack38459280755editdlrm
git-sh-i18n16830644editdlrm
git-sh-i18n--envsubst22365280755editdlrm
git-sh-setup83980644editdlrm
git-shell22366880755editdlrm
git-shortlog38459280755editdlrm
git-show38459280755editdlrm
git-show-branch38459280755editdlrm
git-show-index38459280755editdlrm
git-show-ref38459280755editdlrm
git-sparse-checkout38459280755editdlrm
git-stage38459280755editdlrm
git-stash38459280755editdlrm
git-status38459280755editdlrm
git-stripspace38459280755editdlrm
git-submodule105080755editdlrm
git-submodule--helper38459280755editdlrm
git-switch38459280755editdlrm
git-symbolic-ref38459280755editdlrm
git-tag38459280755editdlrm
git-unpack-file38459280755editdlrm
git-unpack-objects38459280755editdlrm
git-update-index38459280755editdlrm
git-update-ref38459280755editdlrm
git-update-server-info38459280755editdlrm
git-upload-archive38459280755editdlrm
git-upload-pack38459280755editdlrm
git-var38459280755editdlrm
git-verify-commit38459280755editdlrm
git-verify-pack38459280755editdlrm
git-verify-tag38459280755editdlrm
git-version38459280755editdlrm
git-web--browse44010755editdlrm
git-whatchanged38459280755editdlrm
git-worktree38459280755editdlrm
git-write-tree38459280755editdlrm
scalar22909120755editdlrm
Edit: /usr/libexec/git-core/git-merge-octopus (2477B)
#!/bin/sh # # Copyright (c) 2005 Junio C Hamano # # Resolve two or more trees. # . git-sh-setup LF=' ' # The first parameters up to -- are merge bases; the rest are heads. bases= head= remotes= sep_seen= for arg do case ",$sep_seen,$head,$arg," in *,--,) sep_seen=yes ;; ,yes,,*) head=$arg ;; ,yes,*) remotes="$remotes$arg " ;; *) bases="$bases$arg " ;; esac done # Reject if this is not an octopus -- resolve should be used instead. case "$remotes" in ?*' '?*) ;; *) exit 2 ;; esac # MRC is the current "merge reference commit" # MRT is the current "merge result tree" if ! git diff-index --quiet --cached HEAD -- then gettextln "Error: Your local changes to the following files would be overwritten by merge" git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /' exit 2 fi MRC=$(git rev-parse --verify -q $head) MRT=$(git write-tree) NON_FF_MERGE=0 OCTOPUS_FAILURE=0 for SHA1 in $remotes do case "$OCTOPUS_FAILURE" in 1) # We allow only last one to have a hand-resolvable # conflicts. Last round failed and we still had # a head to merge. gettextln "Automated merge did not work." gettextln "Should not be doing an octopus." exit 2 esac eval pretty_name=\${GITHEAD_$SHA1:-$SHA1} if test "$SHA1" = "$pretty_name" then SHA1_UP="$(echo "$SHA1" | tr a-z A-Z)" eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name} fi common=$(git merge-base --all $SHA1 $MRC) || die "$(eval_gettext "Unable to find common commit with \$pretty_name")" case "$LF$common$LF" in *"$LF$SHA1$LF"*) eval_gettextln "Already up to date with \$pretty_name" continue ;; esac if test "$common,$NON_FF_MERGE" = "$MRC,0" then # The first head being merged was a fast-forward. # Advance MRC to the head being merged, and use that # tree as the intermediate result of the merge. # We still need to count this as part of the parent set. eval_gettextln "Fast-forwarding to: \$pretty_name" git read-tree -u -m $head $SHA1 || exit MRC=$SHA1 MRT=$(git write-tree) continue fi NON_FF_MERGE=1 eval_gettextln "Trying simple merge with \$pretty_name" git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2 next=$(git write-tree 2>/dev/null) if test $? -ne 0 then gettextln "Simple merge did not work, trying automatic merge." git merge-index -o git-merge-one-file -a || OCTOPUS_FAILURE=1 next=$(git write-tree 2>/dev/null) fi MRC="$MRC $SHA1" MRT=$next done exit "$OCTOPUS_FAILURE"