Go to file
Elijah Newren 1f0c3a29da merge-tree: implement real merges
This adds the ability to perform real merges rather than just trivial
merges (meaning handling three way content merges, recursive ancestor
consolidation, renames, proper directory/file conflict handling, and so
forth).  However, unlike `git merge`, the working tree and index are
left alone and no branch is updated.

The only output is:
  - the toplevel resulting tree printed on stdout
  - exit status of 0 (clean), 1 (conflicts present), anything else
    (merge could not be performed; unknown if clean or conflicted)

This output is meant to be used by some higher level script, perhaps in
a sequence of steps like this:

   NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2)
   test $? -eq 0 || die "There were conflicts..."
   NEWCOMMIT=$(git commit-tree $NEWTREE -p $BRANCH1 -p $BRANCH2)
   git update-ref $BRANCH1 $NEWCOMMIT

Note that higher level scripts may also want to access the
conflict/warning messages normally output during a merge, or have quick
access to a list of files with conflicts.  That is not available in this
preliminary implementation, but subsequent commits will add that
ability (meaning that NEWTREE would be a lot more than a tree in the
case of conflicts).

This also marks the traditional trivial merge of merge-tree as
deprecated.  The trivial merge not only had limited applicability, the
output format was also difficult to work with (and its format
undocumented), and will generally be less performant than real merges.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-22 16:10:05 -07:00
.github ci(github): bring back the 'print test failures' step 2022-06-08 16:12:37 -07:00
Documentation merge-tree: implement real merges 2022-06-22 16:10:05 -07:00
block-sha1
builtin merge-tree: implement real merges 2022-06-22 16:10:05 -07:00
ci Merge branch 'js/ci-github-workflow-markup' 2022-06-17 10:33:32 -07:00
compat Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
contrib Merge branch 'jp/prompt-clear-before-upstream-mark' 2022-06-21 10:07:50 -07:00
ewah
git-gui
gitk-git
gitweb gitweb: switch to an XHTML5 DOCTYPE 2022-06-02 11:51:15 -07:00
mergetools
negotiator
perl
po
ppc
refs
reftable
sha1collisiondetection@855827c583
sha1dc
sha256
t merge-tree: implement real merges 2022-06-22 16:10:05 -07:00
templates fsmonitor: query watchman with right valid json 2022-06-07 10:00:49 -07:00
trace2
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN Git 2.37-rc2 2022-06-22 09:07:56 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
README.md
RelNotes Prepare for 2.36.2 2022-06-08 14:27:53 -07:00
SECURITY.md
abspath.c
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
advice.c
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c
apply.h
archive-tar.c
archive-zip.c
archive.c archive --add-virtual-file: allow paths containing colons 2022-05-30 23:07:31 -07:00
archive.h
attr.c
attr.h
banned.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
branch.h
builtin.h
bulk-checkin.c Merge branch 'tb/cruft-packs' 2022-06-03 14:30:37 -07:00
bulk-checkin.h
bundle.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
bundle.h
cache-tree.c cache-tree: remove cache_tree_find_path() 2022-06-16 11:59:56 -07:00
cache-tree.h cache-tree: remove cache_tree_find_path() 2022-06-16 11:59:56 -07:00
cache.h Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c
chunk-format.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c Merge branch 'tb/cruft-packs' 2022-06-03 14:30:37 -07:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
commit.h
common-main.c usage.c: add a non-fatal bug() function to go with BUG() 2022-06-02 12:51:35 -07:00
config.c Merge branch 'ns/batch-fsync' 2022-06-03 14:30:34 -07:00
config.h
config.mak.dev Revert -Wno-error=dangling-pointer 2022-06-01 08:49:13 -07:00
config.mak.in
config.mak.uname Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
configure.ac
connect.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
connect.h
connected.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
connected.h
convert.c
convert.h
copy.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
date.c
date.h
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore-rotate.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'js/ci-gcc-12-fixes' into maint 2022-06-08 14:27:50 -07:00
dir.h
editor.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
entry.c
entry.h
environment.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ds/bundle-uri' 2022-06-03 14:30:34 -07:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor--daemon.h fsmonitor--daemon: stub in health thread 2022-05-26 15:59:27 -07:00
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-settings.c fsmonitor: avoid memory leak in `fsm_settings__get_incompatible_msg()` 2022-06-16 13:22:03 -07:00
fsmonitor-settings.h fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible 2022-05-26 15:59:26 -07:00
fsmonitor.c fsmonitor: never set CE_FSMONITOR_VALID on submodules 2022-05-26 15:59:27 -07:00
fsmonitor.h fsmonitor: never set CE_FSMONITOR_VALID on submodules 2022-05-26 15:59:27 -07:00
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'cb/path-owner-check-with-sudo-plus' 2022-06-17 17:12:31 -07:00
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c merge-tree: add option parsing and initial shell for real merge function 2022-06-22 16:10:05 -07:00
git.rc
gpg-interface.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
hook.c Merge branch 'ab/hooks-regression-fix' 2022-06-13 15:53:41 -07:00
hook.h
http-backend.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
http-fetch.c
http-push.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
http-walker.c
http.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
http.h
ident.c
imap-send.c
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
merge-ort.h
merge-recursive.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
midx.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-file.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
object-name.c
object-store.h Merge branch 'tb/cruft-packs' 2022-06-03 14:30:37 -07:00
object.c
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
pack-bitmap.c Merge branch 'tb/midx-race-in-pack-objects' 2022-06-03 14:30:35 -07:00
pack-bitmap.h
pack-check.c
pack-mtimes.c pack-mtimes: avoid closing a bogus file descriptor 2022-06-16 13:22:03 -07:00
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c pack-write: drop always-NULL parameter 2022-06-16 11:59:55 -07:00
pack.h
packfile.c Merge branch 'tb/cruft-packs' 2022-06-03 14:30:37 -07:00
packfile.h
pager.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c parse-options.c: use optbug() instead of BUG() "opts" check 2022-06-02 12:51:35 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'ds/bundle-uri' 2022-06-03 14:30:34 -07:00
path.h
pathspec.c Merge branch 'jc/all-negative-pathspec' 2022-06-07 14:10:59 -07:00
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
promisor-remote.h
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c Merge branch 'pb/range-diff-with-submodule' 2022-06-13 15:53:41 -07:00
range-diff.h
reachable.c
reachable.h
read-cache.c read_index_from(): avoid memory leak 2022-06-16 13:22:03 -07:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c
refs.h
refspec.c
refspec.h
remote-curl.c
remote.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
remote.h
replace-object.c
replace-object.h
repo-settings.c
repository.c
repository.h
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
revision.h Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
run-command.c Merge branch 'js/wait-or-whine-can-fail' 2022-06-13 15:53:44 -07:00
run-command.h Merge branch 'ab/hooks-regression-fix' 2022-06-13 15:53:41 -07:00
send-pack.c
send-pack.h
sequencer.c Merge branch 'jc/revert-show-parent-info' 2022-06-15 15:09:27 -07:00
sequencer.h revert: optionally refer to commit in the "reference" format 2022-05-26 23:05:03 -07:00
serve.c
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'jt/unparse-commit-upon-graft-change' 2022-06-13 15:53:42 -07:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c Merge branch 'ds/sparse-sparse-checkout' 2022-06-03 14:30:35 -07:00
sparse-index.h Merge branch 'ds/sparse-sparse-checkout' 2022-06-03 14:30:35 -07:00
split-index.c
split-index.h
stable-qsort.c
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c
strvec.h
sub-process.c
sub-process.h
submodule-config.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
submodule-config.h
submodule.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
submodule.h Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c common-main.c: move non-trace2 exit() behavior out of trace2.c 2022-06-02 12:51:30 -07:00
trace2.h common-main.c: move non-trace2 exit() behavior out of trace2.c 2022-06-02 12:51:30 -07:00
trailer.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
trailer.h
transport-helper.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
transport-internal.h
transport.c Merge branch 'fh/transport-push-leakfix' 2022-06-07 14:10:57 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
unpack-trees.h
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c bug_fl(): correctly initialize trace2 va_list 2022-06-16 13:28:22 -07:00
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

README.md

Build status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-<commandname>.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). The mailing list archives are available at https://lore.kernel.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks