/
usr
/
libexec
/
git-core
/
/usr/libexec/git-core
mkdir
upload
Name
Size
Mode
Actions
git
1139544
0755
edit
dl
rm
git-add
1139544
0755
edit
dl
rm
git-add--interactive
35716
0755
edit
dl
rm
git-am
19036
0755
edit
dl
rm
git-annotate
1139544
0755
edit
dl
rm
git-apply
1139544
0755
edit
dl
rm
git-archive
1139544
0755
edit
dl
rm
git-bisect
10021
0755
edit
dl
rm
git-bisect--helper
1139544
0755
edit
dl
rm
git-blame
1139544
0755
edit
dl
rm
git-branch
1139544
0755
edit
dl
rm
git-bundle
1139544
0755
edit
dl
rm
git-cat-file
1139544
0755
edit
dl
rm
git-check-attr
1139544
0755
edit
dl
rm
git-check-ref-format
1139544
0755
edit
dl
rm
git-checkout
1139544
0755
edit
dl
rm
git-checkout-index
1139544
0755
edit
dl
rm
git-cherry
1139544
0755
edit
dl
rm
git-cherry-pick
1139544
0755
edit
dl
rm
git-clean
1139544
0755
edit
dl
rm
git-clone
1139544
0755
edit
dl
rm
git-commit
1139544
0755
edit
dl
rm
git-commit-tree
1139544
0755
edit
dl
rm
git-config
1139544
0755
edit
dl
rm
git-count-objects
1139544
0755
edit
dl
rm
git-describe
1139544
0755
edit
dl
rm
git-diff
1139544
0755
edit
dl
rm
git-diff-files
1139544
0755
edit
dl
rm
git-diff-index
1139544
0755
edit
dl
rm
git-diff-tree
1139544
0755
edit
dl
rm
git-difftool
2696
0755
edit
dl
rm
git-difftool--helper
1745
0755
edit
dl
rm
git-fast-export
1139544
0755
edit
dl
rm
git-fast-import
501632
0755
edit
dl
rm
git-fetch
1139544
0755
edit
dl
rm
git-fetch-pack
1139544
0755
edit
dl
rm
git-filter-branch
12172
0755
edit
dl
rm
git-fmt-merge-msg
1139544
0755
edit
dl
rm
git-for-each-ref
1139544
0755
edit
dl
rm
git-format-patch
1139544
0755
edit
dl
rm
git-fsck
1139544
0755
edit
dl
rm
git-fsck-objects
1139544
0755
edit
dl
rm
git-gc
1139544
0755
edit
dl
rm
git-get-tar-commit-id
1139544
0755
edit
dl
rm
git-grep
1139544
0755
edit
dl
rm
git-hash-object
1139544
0755
edit
dl
rm
git-help
1139544
0755
edit
dl
rm
git-http-backend
469088
0755
edit
dl
rm
git-http-fetch
490432
0755
edit
dl
rm
git-http-push
506560
0755
edit
dl
rm
git-imap-send
486656
0755
edit
dl
rm
git-index-pack
1139544
0755
edit
dl
rm
git-init
1139544
0755
edit
dl
rm
git-init-db
1139544
0755
edit
dl
rm
git-instaweb
248389
0755
edit
dl
rm
git-log
1139544
0755
edit
dl
rm
git-lost-found
554
0755
edit
dl
rm
git-ls-files
1139544
0755
edit
dl
rm
git-ls-remote
1139544
0755
edit
dl
rm
git-ls-tree
1139544
0755
edit
dl
rm
git-mailinfo
1139544
0755
edit
dl
rm
git-mailsplit
1139544
0755
edit
dl
rm
git-merge
1139544
0755
edit
dl
rm
git-merge-base
1139544
0755
edit
dl
rm
git-merge-file
1139544
0755
edit
dl
rm
git-merge-index
1139544
0755
edit
dl
rm
git-merge-octopus
2068
0755
edit
dl
rm
git-merge-one-file
3814
0755
edit
dl
rm
git-merge-ours
1139544
0755
edit
dl
rm
git-merge-recursive
1139544
0755
edit
dl
rm
git-merge-resolve
944
0755
edit
dl
rm
git-merge-subtree
1139544
0755
edit
dl
rm
git-merge-tree
1139544
0755
edit
dl
rm
git-mergetool
6099
0755
edit
dl
rm
git-mergetool--lib
9006
0644
edit
dl
rm
git-mktag
1139544
0755
edit
dl
rm
git-mktree
1139544
0755
edit
dl
rm
git-mv
1139544
0755
edit
dl
rm
git-name-rev
1139544
0755
edit
dl
rm
git-notes
1139544
0755
edit
dl
rm
git-pack-objects
1139544
0755
edit
dl
rm
git-pack-redundant
1139544
0755
edit
dl
rm
git-pack-refs
1139544
0755
edit
dl
rm
git-parse-remote
1941
0644
edit
dl
rm
git-patch-id
1139544
0755
edit
dl
rm
git-peek-remote
1139544
0755
edit
dl
rm
git-prune
1139544
0755
edit
dl
rm
git-prune-packed
1139544
0755
edit
dl
rm
git-pull
8027
0755
edit
dl
rm
git-push
1139544
0755
edit
dl
rm
git-quiltimport
3348
0755
edit
dl
rm
git-read-tree
1139544
0755
edit
dl
rm
git-rebase
14646
0755
edit
dl
rm
git-rebase--interactive
24915
0755
edit
dl
rm
git-receive-pack
1139544
0755
edit
dl
rm
git-reflog
1139544
0755
edit
dl
rm
git-relink
4201
0755
edit
dl
rm
git-remote
1139544
0755
edit
dl
rm
git-remote-ftp
499168
0755
edit
dl
rm
git-remote-ftps
499168
0755
edit
dl
rm
git-remote-http
499168
0755
edit
dl
rm
git-remote-https
499168
0755
edit
dl
rm
git-repack
4492
0755
edit
dl
rm
git-replace
1139544
0755
edit
dl
rm
git-repo-config
1139544
0755
edit
dl
rm
git-request-pull
1592
0755
edit
dl
rm
git-rerere
1139544
0755
edit
dl
rm
git-reset
1139544
0755
edit
dl
rm
git-rev-list
1139544
0755
edit
dl
rm
git-rev-parse
1139544
0755
edit
dl
rm
git-revert
1139544
0755
edit
dl
rm
git-rm
1139544
0755
edit
dl
rm
git-send-pack
1139544
0755
edit
dl
rm
git-sh-setup
4013
0644
edit
dl
rm
git-shell
461304
0755
edit
dl
rm
git-shortlog
1139544
0755
edit
dl
rm
git-show
1139544
0755
edit
dl
rm
git-show-branch
1139544
0755
edit
dl
rm
git-show-index
10872
0755
edit
dl
rm
git-show-ref
1139544
0755
edit
dl
rm
git-stage
1139544
0755
edit
dl
rm
git-stash
8838
0755
edit
dl
rm
git-status
1139544
0755
edit
dl
rm
git-stripspace
1139544
0755
edit
dl
rm
git-submodule
17784
0755
edit
dl
rm
git-symbolic-ref
1139544
0755
edit
dl
rm
git-tag
1139544
0755
edit
dl
rm
git-tar-tree
1139544
0755
edit
dl
rm
git-unpack-file
1139544
0755
edit
dl
rm
git-unpack-objects
1139544
0755
edit
dl
rm
git-update-index
1139544
0755
edit
dl
rm
git-update-ref
1139544
0755
edit
dl
rm
git-update-server-info
1139544
0755
edit
dl
rm
git-upload-archive
1139544
0755
edit
dl
rm
git-upload-pack
471216
0755
edit
dl
rm
git-var
1139544
0755
edit
dl
rm
git-verify-pack
1139544
0755
edit
dl
rm
git-verify-tag
1139544
0755
edit
dl
rm
git-web--browse
3961
0755
edit
dl
rm
git-whatchanged
1139544
0755
edit
dl
rm
git-write-tree
1139544
0755
edit
dl
rm
Edit:
/usr/libexec/git-core/git-merge-resolve
(944B)
#!/bin/sh # # Copyright (c) 2005 Linus Torvalds # Copyright (c) 2005 Junio C Hamano # # Resolve two trees, using enhanced multi-base read-tree. # 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 # Give up if we are given two or more remotes -- not handling octopus. case "$remotes" in ?*' '?*) exit 2 ;; esac # Give up if this is a baseless merge. if test '' = "$bases" then exit 2 fi git update-index -q --refresh git read-tree -u -m --aggressive $bases $head $remotes || exit 2 echo "Trying simple merge." if result_tree=$(git write-tree 2>/dev/null) then exit 0 else echo "Simple merge failed, trying Automatic merge." if git-merge-index -o git-merge-one-file -a then exit 0 else exit 1 fi fi
Save
cmd:
run