/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-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"