Search results for subtree

Branching and Merging
/book/en/Appendix-C:-Git-Commands-Branching-and-Merging
/_signing_commits">Signing Commits. Finally, we learned about Subtree merging in Subtree Merging.
Advanced Merging
/book/en/Git-Tools-Advanced-Merging
) so when you later merge the release branch again, there are no conflicts from the bugfix. Subtree Merging
Git Objects
/book/en/Git-Internals-Git-Objects
corresponding more or less to inodes or file contents. A single tree object contains one or more entries, each of which is the SHA-1 hash of a blob or subtree with its associated mode, type, and filename
Git as a Client
/book/en/Git-and-Other-Systems-Git-as-a-Client
” specifier in the depot path; that tells git-p4 to clone not just the latest changeset for that subtree, but all changesets that have ever touched those paths. This is closer to Git’s concept of a clone
api-merge
/docs/api-merge
up corresponding files in the trees to be merged (rename detection, subtree shifting), reporting edge cases like add/add and rename/rename conflicts to the user; * performing a three-way merge
merge-strategies
/docs/merge-strategies
-renames=`. subtree[=];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging
index-format
/docs/index-format
are written out in the top-down, depth-first order. The first entry represents the root level of the repository, followed by the first subtree--let's call this A--of the root level (with its name
gitformat-index
/docs/gitformat-index
represents the root level of the repository, followed by the first subtree--let's call this A--of the root level (with its name relative to the root level), followed by the first subtree of A (with its
git-merge
/docs/git-merge
. This overrides the 'merge.renames' configuration variable. See also linkgit:git-diff[1] `--find-renames`. rename-threshold=;; Deprecated synonym for `find-renames=`. subtree[=
git-pull
/docs/git-pull
`. rename-threshold=;; Deprecated synonym for `find-renames=`. subtree[=];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be
git-rebase
/docs/git-rebase
-renames`. rename-threshold=;; Deprecated synonym for `find-renames=`. subtree[=];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how
gitglossary
/docs/gitglossary
pathspec is limited to that subtree. * the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using
git-fast-import
/docs/git-fast-import
', 'filemodify', or 'ls' commands. If there is no file or subtree at that path, 'git fast-import' will instead report ==== missing SP LF ==== See ``Responses To Commands'' below for details about
user-manual
/docs/user-manual
represents a directory prefix. The scope of that pathspec is limited to that subtree. * the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory