mirror of
https://github.com/git/git.git
synced 2024-11-15 13:43:45 +01:00
68faf68938
This merge strategy largely piggy-backs on git-merge-recursive. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level. This adjustment is also done to the common ancestor tree. If you are pulling updates from git-gui repository into git.git repository, the root level of the former corresponds to git-gui/ subdirectory of the latter. The tree object of git-gui's toplevel is wrapped in a fake tree object, whose sole entry has name 'git-gui' and records object name of the true tree, before being used by the 3-way merge code. If you are merging the other way, only the git-gui/ subtree of git.git is extracted and merged into git-gui's toplevel. The detection of corresponding subtree is done by comparing the pathnames and types in the toplevel of the tree. Heuristics galore! That's the git way ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
168 lines
2.2 KiB
Text
168 lines
2.2 KiB
Text
GIT-CFLAGS
|
|
GIT-GUI-VARS
|
|
GIT-VERSION-FILE
|
|
git
|
|
git-add
|
|
git-add--interactive
|
|
git-am
|
|
git-annotate
|
|
git-apply
|
|
git-applymbox
|
|
git-applypatch
|
|
git-archimport
|
|
git-archive
|
|
git-bisect
|
|
git-blame
|
|
git-branch
|
|
git-bundle
|
|
git-cat-file
|
|
git-check-ref-format
|
|
git-checkout
|
|
git-checkout-index
|
|
git-cherry
|
|
git-cherry-pick
|
|
git-clean
|
|
git-clone
|
|
git-commit
|
|
git-commit-tree
|
|
git-config
|
|
git-convert-objects
|
|
git-count-objects
|
|
git-cvsexportcommit
|
|
git-cvsimport
|
|
git-cvsserver
|
|
git-daemon
|
|
git-diff
|
|
git-diff-files
|
|
git-diff-index
|
|
git-diff-tree
|
|
git-describe
|
|
git-fast-import
|
|
git-fetch
|
|
git-fetch--tool
|
|
git-fetch-pack
|
|
git-findtags
|
|
git-fmt-merge-msg
|
|
git-for-each-ref
|
|
git-format-patch
|
|
git-fsck
|
|
git-fsck-objects
|
|
git-gc
|
|
git-get-tar-commit-id
|
|
git-grep
|
|
git-hash-object
|
|
git-http-fetch
|
|
git-http-push
|
|
git-imap-send
|
|
git-index-pack
|
|
git-init
|
|
git-init-db
|
|
git-instaweb
|
|
git-local-fetch
|
|
git-log
|
|
git-lost-found
|
|
git-ls-files
|
|
git-ls-remote
|
|
git-ls-tree
|
|
git-mailinfo
|
|
git-mailsplit
|
|
git-merge
|
|
git-merge-base
|
|
git-merge-index
|
|
git-merge-file
|
|
git-merge-tree
|
|
git-merge-octopus
|
|
git-merge-one-file
|
|
git-merge-ours
|
|
git-merge-recursive
|
|
git-merge-resolve
|
|
git-merge-stupid
|
|
git-merge-subtree
|
|
git-mergetool
|
|
git-mktag
|
|
git-mktree
|
|
git-name-rev
|
|
git-mv
|
|
git-pack-redundant
|
|
git-pack-objects
|
|
git-pack-refs
|
|
git-parse-remote
|
|
git-patch-id
|
|
git-peek-remote
|
|
git-prune
|
|
git-prune-packed
|
|
git-pull
|
|
git-push
|
|
git-quiltimport
|
|
git-read-tree
|
|
git-rebase
|
|
git-receive-pack
|
|
git-reflog
|
|
git-relink
|
|
git-remote
|
|
git-repack
|
|
git-repo-config
|
|
git-request-pull
|
|
git-rerere
|
|
git-reset
|
|
git-rev-list
|
|
git-rev-parse
|
|
git-revert
|
|
git-rm
|
|
git-runstatus
|
|
git-send-email
|
|
git-send-pack
|
|
git-sh-setup
|
|
git-shell
|
|
git-shortlog
|
|
git-show
|
|
git-show-branch
|
|
git-show-index
|
|
git-show-ref
|
|
git-ssh-fetch
|
|
git-ssh-pull
|
|
git-ssh-push
|
|
git-ssh-upload
|
|
git-status
|
|
git-stripspace
|
|
git-svn
|
|
git-svnimport
|
|
git-symbolic-ref
|
|
git-tag
|
|
git-tar-tree
|
|
git-unpack-file
|
|
git-unpack-objects
|
|
git-update-index
|
|
git-update-ref
|
|
git-update-server-info
|
|
git-upload-archive
|
|
git-upload-pack
|
|
git-var
|
|
git-verify-pack
|
|
git-verify-tag
|
|
git-whatchanged
|
|
git-write-tree
|
|
git-core-*/?*
|
|
gitk-wish
|
|
gitweb/gitweb.cgi
|
|
test-chmtime
|
|
test-date
|
|
test-delta
|
|
test-dump-cache-tree
|
|
test-match-trees
|
|
common-cmds.h
|
|
*.tar.gz
|
|
*.dsc
|
|
*.deb
|
|
git-core.spec
|
|
*.exe
|
|
*.[ao]
|
|
*.py[co]
|
|
config.mak
|
|
autom4te.cache
|
|
config.cache
|
|
config.log
|
|
config.status
|
|
config.mak.autogen
|
|
config.mak.append
|
|
configure
|