Go to file

Elijah Newren ad45b327c0 merge-recursive.[ch]: thoroughly debug these As a wise man once told me, "Deleted code is debugged code!" So, move the functions that are shared between merge-recursive and merge-ort from the former to the latter, and then debug the remainder of merge-recursive.[ch]. Joking aside, merge-ort was always intended to replace merge-recursive. It has numerous advantages over merge-recursive (operates much faster, can operate without a worktree or index, and fixes a number of known bugs and suboptimal merges). Since we have now replaced all callers of merge-recursive with equivalent functions from merge-ort, move the shared functions from the former to the latter, and delete the remainder of merge-recursive.[ch]. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2025-04-08 13:59:13 -07:00
.github	…
Documentation	merge-recursive.[ch]: thoroughly debug these	2025-04-08 13:59:13 -07:00
bin-wrappers	…
block-sha1	…
builtin	merge, sequencer: switch recursive merges over to ort	2025-04-08 13:59:12 -07:00
ci	…
compat	Merge branch 'ps/path-sans-the-repository'	2025-03-05 10:37:43 -08:00
compiler-tricks	git-compat-util: add NOT_CONSTANT macro and use it in atfork_prepare()	2025-03-17 17:30:49 -07:00
contrib	Merge branch 'js/win-2.49-build-fixes'	2025-03-06 14:06:32 -08:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
negotiator	…
oss-fuzz	meson: simplify use of the common-main library	2025-02-26 09:09:35 -08:00
perl	…
po	Merge branch 'l10n/zh-TW/2025-03-09' of github.com:l10n-tw/git-po	2025-03-13 21:57:56 +08:00
refs	Merge branch 'ps/refname-avail-check-optim'	2025-03-29 16:39:07 +09:00
reftable	reftable: release name on reftable_reader_new() error	2025-03-04 09:21:39 -08:00
sha1	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	Merge branch 'ew/hash-with-openssl-evp'	2023-08-09 16:18:15 -07:00
subprojects	…
t	merge, sequencer: switch recursive merges over to ort	2025-04-08 13:59:12 -07:00
templates	…
trace2	trace2/tr2_sysenv.c: .txt -> .adoc fixes	2025-03-03 13:49:26 -08:00
xdiff	Merge branch 'rs/xdiff-context-length-fix'	2025-03-29 16:39:10 +09:00
.cirrus.yml	…
.clang-format	…
.editorconfig	editorconfig: add .bash extension	2025-03-03 08:39:47 -08:00
.gitattributes	.gitattributes: more .txt -> .adoc updates	2025-03-03 13:49:19 -08:00
.gitignore	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
.gitlab-ci.yml	Merge branch 'ps/build-meson-fixes'	2025-03-03 08:53:03 -08:00
.gitmodules	…
.mailmap	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-BUILD-OPTIONS.in	…
GIT-VERSION-FILE.in	…
GIT-VERSION-GEN	Start 2.50 cycle (batch #1 )	2025-03-26 16:26:11 +09:00
INSTALL	…
LGPL-2.1	…
Makefile	merge-recursive.[ch]: thoroughly debug these	2025-04-08 13:59:13 -07:00
README.md	README: .txt -> .adoc fixes	2025-03-03 13:49:19 -08:00
RelNotes	Start 2.50 cycle (batch #1 )	2025-03-26 16:26:11 +09:00
SECURITY.md	…
abspath.c	…
abspath.h	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	…
advice.c	…
advice.h	advice.h: .txt -> .adoc fixes	2025-03-03 13:49:21 -08:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	apply.c: .txt -> .adoc fixes	2025-03-03 13:49:22 -08:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
attr.c	…
attr.h	…
banned.h	…
base85.c	…
base85.h	…
bisect.c	…
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	…
branch.h	…
builtin.h	Merge branch 'jt/diff-pairs'	2025-03-26 16:26:09 +09:00
bulk-checkin.c	…
bulk-checkin.h	…
bundle-uri.c	…
bundle-uri.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
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	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
commit-graph.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	…
commit.h	…
common-exit.c	…
common-init.c	…
common-init.h	…
common-main.c	…
config.c	Merge branch 'ua/some-builtins-wo-the-repository'	2025-03-26 16:26:10 +09:00
config.h	config: teach repo_config to allow `repo` to be NULL	2025-03-07 16:52:00 -08:00
config.mak.dev	config.mak.dev: enable -Wunreachable-code	2025-03-17 17:31:28 -07:00
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	Merge branch 'cc/lop-remote'	2025-03-05 10:37:44 -08:00
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
copy.h	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	…
date.h	…
decorate.c	decorate: fix sign comparison warnings	2025-03-10 13:21:13 -07:00
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diagnose.c	…
diagnose.h	…
diff-delta.c	…
diff-lib.c	…
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	diff: add option to skip resolving diff statuses	2025-03-03 08:17:47 -08:00
diff.h	Merge branch 'jt/diff-pairs'	2025-03-26 16:26:09 +09:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	diffcore-rename: fix BUG when break detection and --follow used together	2025-03-14 18:43:28 -07:00
diffcore-rotate.c	…
diffcore.h	diffcore.h: .txt -> .adoc fixes	2025-03-03 13:49:23 -08:00
dir-iterator.c	refs/iterator: separate lifecycle from iteration	2025-03-12 11:31:18 -07:00
dir-iterator.h	refs/iterator: separate lifecycle from iteration	2025-03-12 11:31:18 -07:00
dir.c	Merge branch 'ps/path-sans-the-repository'	2025-03-05 10:37:43 -08:00
dir.h	Merge branch 'am/dir-dedup-decl-of-repository'	2025-03-29 16:39:09 +09:00
editor.c	…
editor.h	…
entry.c	…
entry.h	…
environment.c	Merge branch 'ps/path-sans-the-repository'	2025-03-05 10:37:43 -08:00
environment.h	environment: move access to "core.sharedRepository" into repo settings	2025-02-28 13:54:11 -08:00
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	…
fetch-pack.h	…
fmt-merge-msg.c	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	Merge branch 'sj/ref-consistency-checks-more'	2025-03-26 16:26:10 +09:00
fsmonitor--daemon.h	…
fsmonitor-ipc.c	…
fsmonitor-ipc.h	…
fsmonitor-ll.h	…
fsmonitor-path-utils.h	…
fsmonitor-settings.c	…
fsmonitor-settings.h	…
fsmonitor.c	…
fsmonitor.h	…
generate-cmdlist.sh	…
generate-configlist.sh	…
generate-hooklist.sh	…
generate-perl.sh	…
generate-python.sh	…
generate-script.sh	…
gettext.c	…
gettext.h	…
git-archimport.perl	…
git-compat-util.h	Merge branch 'jk/use-wunreachable-code-for-devs'	2025-03-29 16:39:10 +09: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-zlib.c	…
git-zlib.h	…
git.c	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
git.rc.in	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash-lookup.c	…
hash-lookup.h	…
hash.h	object-name: allow skipping ambiguity checks in `get_oid()` family	2025-03-12 11:31:16 -07:00
hashmap.c	…
hashmap.h	…
help.c	Merge branch 'tc/zlib-ng-fix'	2025-03-12 12:06:58 -07:00
help.h	…
hex-ll.c	…
hex-ll.h	…
hex.c	…
hex.h	…
hook.c	…
hook.h	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	ident: stop assuming that `gw_gecos` is writable	2025-03-06 08:35:07 -08:00
ident.h	…
imap-send.c	…
iterator.h	refs/iterator: separate lifecycle from iteration	2025-03-12 11:31:18 -07:00
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-options.h: .txt -> .adoc fixes	2025-03-03 13:49:23 -08:00
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	…
list-objects.h	…
list.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	…
log-tree.h	…
loose.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
loose.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
match-trees.h	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-ll.c	…
merge-ll.h	…
merge-ort-wrappers.c	merge-ort: support having merge verbosity be set to 0	2025-03-18 09:48:51 -07:00
merge-ort-wrappers.h	merge-recursive.[ch]: thoroughly debug these	2025-04-08 13:59:13 -07:00
merge-ort.c	merge-recursive.[ch]: thoroughly debug these	2025-04-08 13:59:13 -07:00
merge-ort.h	merge-recursive.[ch]: thoroughly debug these	2025-04-08 13:59:13 -07:00
merge.c	…
merge.h	…
mergesort.h	…
meson.build	merge-recursive.[ch]: thoroughly debug these	2025-04-08 13:59:13 -07:00
meson_options.txt	Merge branch 'ps/meson-contrib-bits'	2025-03-03 08:53:03 -08:00
midx-write.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
midx.c	…
midx.h	…
name-hash.c	…
name-hash.h	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	path: drop `git_path()` in favor of `repo_git_path()`	2025-02-28 13:54:11 -08:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-file-convert.c	…
object-file-convert.h	…
object-file.c	Merge branch 'ps/path-sans-the-repository'	2025-03-05 10:37:43 -08:00
object-file.h	…
object-name.c	Merge branch 'ps/refname-avail-check-optim'	2025-03-29 16:39:07 +09:00
object-name.h	object-name: introduce `repo_get_oid_with_flags()`	2025-03-12 11:31:16 -07:00
object-store-ll.h	…
object-store.h	…
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	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	…
pack-mtimes.c	…
pack-mtimes.h	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	Merge branch 'ps/path-sans-the-repository'	2025-03-05 10:37:43 -08:00
pack.h	…
packfile.c	builtin/pack-objects.c: freshen objects from existing cruft packs	2025-03-13 11:48:04 -07:00
packfile.h	builtin/pack-objects.c: freshen objects from existing cruft packs	2025-03-13 11:48:04 -07:00
pager.c	…
pager.h	…
parallel-checkout.c	…
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	parse-options.h: .txt -> .adoc fixes	2025-03-03 13:49:24 -08:00
parse.c	…
parse.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path-walk.c	…
path-walk.h	…
path.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
path.h	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
preload-index.h	…
pretty.c	…
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol-caps.c	…
protocol-caps.h	…
protocol.c	…
protocol.h	…
prune-packed.c	…
prune-packed.h	…
pseudo-merge.c	…
pseudo-merge.h	pseudo-merge.h: .txt -> .adoc fixes	2025-03-03 13:49:24 -08:00
quote.c	…
quote.h	…
range-diff.c	…
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache-ll.h	…
read-cache.c	Merge branch 'ps/path-sans-the-repository'	2025-03-05 10:37:43 -08:00
read-cache.h	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	…
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
reflog.c	…
reflog.h	…
refs.c	Merge branch 'ps/refname-avail-check-optim'	2025-03-29 16:39:07 +09:00
refs.h	Merge branch 'ps/refname-avail-check-optim'	2025-03-29 16:39:07 +09:00
refspec.c	refspec_ref_prefixes(): clean up refspec_item logic	2025-03-10 13:13:45 -07:00
refspec.h	…
remote-curl.c	…
remote.c	Merge branch 'ps/path-sans-the-repository'	2025-03-05 10:37:43 -08:00
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	environment: move access to "core.sharedRepository" into repo settings	2025-02-28 13:54:11 -08:00
repo-settings.h	environment: move access to "core.sharedRepository" into repo settings	2025-02-28 13:54:11 -08:00
repository.c	repo-settings: introduce function to clear struct	2025-02-28 13:54:11 -08:00
repository.h	…
rerere.c	Merge branch 'ps/path-sans-the-repository'	2025-03-05 10:37:43 -08:00
rerere.h	rerere: let `rerere_path()` write paths into a caller-provided buffer	2025-02-28 13:54:11 -08:00
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	…
run-command.c	git-compat-util: add NOT_CONSTANT macro and use it in atfork_prepare()	2025-03-17 17:30:49 -07:00
run-command.h	…
sane-ctype.h	…
scalar.c	…
send-pack.c	…
send-pack.h	…
sequencer.c	merge, sequencer: switch recursive merges over to ort	2025-04-08 13:59:12 -07:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
server-info.h	…
setup.c	Merge branch 'tz/doc-txt-to-adoc-fixes'	2025-03-06 14:06:31 -08:00
setup.h	…
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	path: drop `git_path()` in favor of `repo_git_path()`	2025-02-28 13:54:11 -08:00
shallow.h	…
shared.mak	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	simple-ipc.h: .txt -> .adoc fixes	2025-03-03 13:49:25 -08:00
sparse-index.c	…
sparse-index.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
statinfo.c	…
statinfo.h	…
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	…
submodule-config.h	…
submodule.c	…
submodule.h	…
symlinks.c	…
symlinks.h	…
tag.c	…
tag.h	…
tar.h	…
tempfile.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
tmp-objdir.h	…
trace.c	…
trace.h	…
trace2.c	…
trace2.h	trace2.h: .txt -> .adoc fixes	2025-03-03 13:49:26 -08:00
trailer.c	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	…
transport.h	transport.h: .txt -> .adoc fixes	2025-03-03 13:49:27 -08:00
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	unpack-trees.c: .txt -> .adoc fixes	2025-03-03 13:49:27 -08:00
unpack-trees.h	…
upload-pack.c	…
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version-def.h.in	…
version.c	Merge branch 'ua/os-version-capability'	2025-02-27 15:23:00 -08:00
version.h	…
versioncmp.c	…
versioncmp.h	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	Merge branch 'sj/ref-consistency-checks-more'	2025-03-26 16:26:10 +09:00
worktree.h	Merge branch 'sj/ref-consistency-checks-more'	2025-03-26 16:26:10 +09:00
wrapper.c	…
wrapper.h	…
write-or-die.c	…
write-or-die.h	…
ws.c	…
ws.h	…
wt-status.c	path: drop `git_path()` in favor of `repo_git_path()`	2025-02-28 13:54:11 -08:00
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	…

README.md

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.adoc to get started, then see Documentation/giteveryday.adoc for a useful minimum set of commands, and Documentation/git-<commandname>.adoc 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.adoc (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 to git+subscribe@vger.kernel.org (see https://subspace.kernel.org/subscribing.html for details). The mailing list archives are available at https://lore.kernel.org/git/, https://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