OXIESEC PANEL
- Current Dir:
/
/
usr
/
libexec
/
git-core
Server IP: 2a02:4780:11:1084:0:327f:3464:10
Upload:
Create Dir:
Name
Size
Modified
Perms
📁
..
-
06/25/2025 07:30:56 AM
rwxr-xr-x
📄
git
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-add
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-add--interactive
46.68 KB
05/22/2023 06:52:18 AM
rwxr-xr-x
📄
git-am
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-annotate
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-apply
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-archive
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-bisect
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-bisect--helper
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-blame
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-branch
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-bugreport
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-bundle
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-cat-file
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-check-attr
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-check-ignore
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-check-mailmap
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-check-ref-format
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-checkout
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-checkout--worker
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-checkout-index
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-cherry
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-cherry-pick
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-clean
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-clone
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-column
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-commit
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-commit-graph
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-commit-tree
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-config
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-contacts
4.4 KB
05/31/2024 12:41:06 AM
rwxr-xr-x
📄
git-count-objects
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-credential
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-credential-cache
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-credential-cache--daemon
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-credential-netrc
10.69 KB
12/17/2024 04:11:49 AM
rwxr-xr-x
📄
git-credential-store
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-describe
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-diagnose
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-diff
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-diff-files
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-diff-index
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-diff-tree
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-difftool
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-difftool--helper
2.55 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-env--helper
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-fast-export
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-fast-import
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-fetch
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-fetch-pack
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-filter-branch
15.49 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-fmt-merge-msg
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-for-each-ref
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-for-each-repo
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-format-patch
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-fsck
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-fsck-objects
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-fsmonitor--daemon
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-gc
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-get-tar-commit-id
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-grep
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-hash-object
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-help
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-hook
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-http-backend
2.14 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-http-fetch
2.17 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-http-push
2.19 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-imap-send
2.19 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-index-pack
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-init
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-init-db
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-interpret-trailers
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-log
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-ls-files
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-ls-remote
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-ls-tree
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-mailinfo
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-mailsplit
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-maintenance
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-merge
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-merge-base
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-merge-file
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-merge-index
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-merge-octopus
2.42 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-merge-one-file
3.61 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-merge-ours
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-merge-recursive
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-merge-resolve
1.2 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-merge-subtree
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-merge-tree
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-mergetool
11.42 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-mergetool--lib
10.48 KB
12/17/2024 04:11:24 AM
rw-r--r--
📄
git-mktag
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-mktree
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-multi-pack-index
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-mv
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-name-rev
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-notes
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-pack-objects
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-pack-redundant
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-pack-refs
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-patch-id
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-prune
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-prune-packed
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-pull
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-push
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-quiltimport
3.61 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-range-diff
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-read-tree
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-rebase
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-receive-pack
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-reflog
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-remote
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-remote-ext
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-remote-fd
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-remote-ftp
2.19 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-remote-ftps
2.19 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-remote-http
2.19 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-remote-https
2.19 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-repack
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-replace
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-request-pull
4.05 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-rerere
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-reset
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-restore
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-rev-list
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-rev-parse
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-revert
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-rm
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-send-pack
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-sh-i18n
1.64 KB
12/17/2024 04:11:24 AM
rw-r--r--
📄
git-sh-i18n--envsubst
2.13 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-sh-setup
8.2 KB
12/17/2024 04:11:24 AM
rw-r--r--
📄
git-shell
2.13 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-shortlog
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-show
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-show-branch
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-show-index
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-show-ref
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-sparse-checkout
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-stage
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-stash
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-status
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-stripspace
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-submodule
10.26 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-submodule--helper
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-switch
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-symbolic-ref
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-tag
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-unpack-file
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-unpack-objects
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-update-index
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-update-ref
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-update-server-info
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-upload-archive
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-upload-pack
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-var
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-verify-commit
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-verify-pack
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-verify-tag
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-version
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-web--browse
4.3 KB
12/17/2024 04:11:24 AM
rwxr-xr-x
📄
git-whatchanged
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-worktree
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📄
git-write-tree
3.67 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
📁
mergetools
-
02/08/2025 12:06:28 AM
rwxr-xr-x
📄
scalar
2.18 MB
12/17/2024 04:12:12 AM
rwxr-xr-x
Editing: git-merge-octopus
Close
#!/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"