A fork of Git containing Microsoft-specific patches.

Перейти к файлу

Elijah Newren 7976721d17 merge-tree: add a --allow-unrelated-histories flag Folks may want to merge histories that have no common ancestry; provide a flag with the same name as used by `git merge` to allow this. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2022-06-22 16:10:06 -07:00
.github	ci(github): bring back the 'print test failures' step	2022-06-08 16:12:37 -07:00
Documentation	merge-tree: add a --allow-unrelated-histories flag	2022-06-22 16:10:06 -07:00
block-sha1	block-sha1: remove use of obsolete x86 assembly	2022-03-10 11:18:05 -08:00
builtin	merge-tree: add a --allow-unrelated-histories flag	2022-06-22 16:10:06 -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	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
git-gui	…
gitk-git	Merge branch 'master' of git://git.ozlabs.org/~paulus/gitk	2022-05-11 08:25:02 -07:00
gitweb	gitweb: switch to an XHTML5 DOCTYPE	2022-06-02 11:51:15 -07:00
mergetools	mergetools: add description to all diff/merge tools	2022-04-03 15:10:04 -07:00
negotiator	…
perl	perl Git.pm: don't ignore signalled failure in _cmd_close()	2022-02-01 15:21:19 -08:00
po	l10n: Document the new l10n workflow	2022-05-26 10:32:58 -07:00
ppc	…
refs	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
reftable	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	merge-tree: add a --allow-unrelated-histories flag	2022-06-22 16:10:06 -07:00
templates	fsmonitor: query watchman with right valid json	2022-06-07 10:00:49 -07:00
trace2	trace2: use designated initializers for "struct tr2_dst"	2022-02-24 15:58:55 -08:00
xdiff	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
.cirrus.yml	ci: update Cirrus-CI image to FreeBSD 12.3	2022-05-25 08:47:11 -07:00
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	Makefile: have "make pot" not "reset --hard"	2022-05-26 10:30:27 -07:00
.gitmodules	…
.mailmap	mailmap: change primary address for Derrick Stolee	2022-02-14 13:27:31 -08:00
.tsan-suppressions	…
CODE_OF_CONDUCT.md	CODE_OF_CONDUCT.md: update PLC members list	2022-02-18 12:36:29 -08:00
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	Merge branch 'po/readme-mention-contributor-hints'	2022-02-09 14:20:59 -08:00
RelNotes	Prepare for 2.36.2	2022-06-08 14:27:53 -07:00
SECURITY.md	…
abspath.c	…
aclocal.m4	…
add-interactive.c	revisions API: have release_revisions() release "prune_data"	2022-04-13 23:56:09 -07:00
add-interactive.h	…
add-patch.c	run-command API: rename "env_array" to "env"	2022-06-02 14:31:16 -07:00
advice.c	Merge branch 'tk/ambiguous-fetch-refspec'	2022-04-04 10:56:24 -07:00
advice.h	Merge branch 'tk/ambiguous-fetch-refspec'	2022-04-04 10:56:24 -07:00
alias.c	…
alias.h	…
alloc.c	alloc.[ch]: remove alloc_report() function	2022-04-01 10:16:11 -07:00
alloc.h	alloc.[ch]: remove alloc_report() function	2022-04-01 10:16:11 -07:00
apply.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
apply.h	range-diff: plug memory leak in common invocation	2022-03-04 13:24:19 -08:00
archive-tar.c	archive-*.c: use designated initializers for "struct archiver"	2022-02-24 15:59:20 -08:00
archive-zip.c	Merge branch 'ab/c99-designated-initializers'	2022-03-06 21:25:32 -08:00
archive.c	archive --add-virtual-file: allow paths containing colons	2022-05-30 23:07:31 -07:00
archive.h	…
attr.c	Merge branch 'ab/refs-various-fixes'	2022-03-29 12:22:02 -07:00
attr.h	attr.h: remove duplicate struct definition	2022-03-14 05:41:08 +00:00
banned.h	C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code	2022-02-21 19:14:19 -08:00
base85.c	…
bisect.c	revisions API users: use release_revisions() needing REV_INFO_INIT	2022-04-13 23:56:08 -07:00
bisect.h	bisect: output state before we are ready to compute bisection	2022-05-11 12:35:11 -07:00
blame.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
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	branch: new autosetupmerge option 'simple' for matching branches	2022-04-29 11:20:55 -07:00
builtin.h	fsmonitor--daemon: add a built-in fsmonitor daemon	2022-03-25 16:04:15 -07:00
bulk-checkin.c	Merge branch 'tb/cruft-packs'	2022-06-03 14:30:37 -07:00
bulk-checkin.h	core.fsyncmethod: batched disk flushes for loose-objects	2022-04-06 13:13:01 -07:00
bundle.c	Merge branch 'ab/plug-leak-in-revisions'	2022-06-07 14:10:56 -07:00
bundle.h	bundle.h: make "fd" version of read_bundle_header() public	2022-05-16 15:02:10 -07:00
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: remove broken and unused cb_unlink	2021-12-07 15:18:35 -08:00
cbtree.h	cbtree: remove broken and unused cb_unlink	2021-12-07 15:18:35 -08:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
checkout.c	…
checkout.h	…
chunk-format.c	chunk-format.h: extract oid_version()	2022-05-26 15:48:26 -07:00
chunk-format.h	chunk-format.h: extract oid_version()	2022-05-26 15:48:26 -07:00
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
command-list.txt	hook: add 'run' subcommand	2022-01-07 15:19:34 -08:00
commit-graph.c	Merge branch 'tb/cruft-packs'	2022-06-03 14:30:37 -07:00
commit-graph.h	commit-graph: fix memory leak in misused string_list API	2022-03-04 13:24:18 -08:00
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	shallow: reset commit grafts when shallow is reset	2022-03-17 17:44:38 -07:00
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	fsmonitor: config settings are repository-specific	2022-03-25 16:04:15 -07:00
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	Merge branch 'ab/misc-cleanup'	2022-05-10 17:41:10 -07:00
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: clarify line ending conversion warning	2022-04-08 12:53:34 -07:00
convert.h	…
copy.c	…
credential.c	urlmatch.c: add and use a *_release() function	2022-03-04 13:24:18 -08:00
credential.h	…
csum-file.c	core.fsync: introduce granular fsync control infrastructure	2022-03-10 15:10:22 -08:00
csum-file.h	core.fsync: introduce granular fsync control infrastructure	2022-03-10 15:10:22 -08:00
ctype.c	…
daemon.c	Merge branch 'ab/env-array'	2022-06-10 15:04:13 -07:00
date.c	date API: add and use a date_mode_release()	2022-02-16 09:40:00 -08:00
date.h	date API: add and use a date_mode_release()	2022-02-16 09:40:00 -08:00
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	detect-compiler: make detection independent of locale	2022-05-09 08:52:26 -07:00
diff-delta.c	…
diff-lib.c	revisions API: add a TODO for diff_free(&revs->diffopt)	2022-04-13 23:56:10 -07:00
diff-merges.c	Merge branch 'ja/i18n-common-messages'	2022-02-25 15:47:35 -08:00
diff-merges.h	…
diff-no-index.c	…
diff.c	merge-ort: make `path_messages` a strmap to a string_list	2022-06-22 16:10:06 -07:00
diff.h	Merge branch 'js/diff-filter-negation-fix'	2022-02-16 15:14:30 -08:00
diffcore-break.c	…
diffcore-delta.c	diffcore-delta.c: LLP64 compatibility, upcast unity for left shift	2021-12-01 14:48:10 -08:00
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	object-file API: have hash_object_file() take "enum object_type"	2022-02-25 17:16:32 -08:00
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	dir API: add a generalized path_match_flags() function	2022-05-16 15:02:09 -07:00
editor.c	run-command API: rename "env_array" to "env"	2022-06-02 14:31:16 -07:00
entry.c	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
entry.h	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
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: add specific noop initializer	2022-03-28 10:25:52 -07:00
fetch-negotiator.h	fetch-negotiator: add specific noop initializer	2022-03-28 10:25:52 -07:00
fetch-pack.c	Merge branch 'ds/bundle-uri'	2022-06-03 14:30:34 -07:00
fetch-pack.h	fetch-pack: add refetch	2022-03-28 10:25:52 -07:00
fmt-merge-msg.c	revisions API users: add straightforward release_revisions()	2022-04-13 23:56:08 -07:00
fmt-merge-msg.h	merge: allow to pretend a merge is made into a different branch	2021-12-20 14:55:02 -08:00
fsck.c	dir API: add a generalized path_match_flags() function	2022-05-16 15:02:09 -07:00
fsck.h	…
fsmonitor--daemon.h	fsmonitor--daemon: stub in health thread	2022-05-26 15:59:27 -07:00
fsmonitor-ipc.c	fsmonitor-ipc: create client routines for git-fsmonitor--daemon	2022-03-25 16:04:15 -07:00
fsmonitor-ipc.h	fsmonitor-ipc: create client routines for git-fsmonitor--daemon	2022-03-25 16:04:15 -07:00
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	add -p: avoid use of undefined $key when ReadKey -> EOF	2021-11-28 15:14:09 -08:00
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	vimdiff: add tool documentation	2022-04-03 15:09:52 -07:00
git-mergetool.sh	…
git-p4.py	Merge branch 'tk/p4-metadata-coding-strategies'	2022-05-20 15:27:00 -07:00
git-quiltimport.sh	…
git-request-pull.sh	…
git-send-email.perl	i18n: fix some badly formatted i18n strings	2022-04-11 14:13:46 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	git-sh-setup: remove remnant bits referring to `git-legacy-stash`	2022-01-27 18:00:09 -08:00
git-submodule.sh	submodule: move core cmd_update() logic to C	2022-03-16 15:07:43 -07:00
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	ssh signing: make verify-commit consider key lifetime	2021-12-09 13:38:04 -08:00
graph.c	log: fix memory leak if --graph is passed multiple times	2022-02-11 10:06:40 -08:00
graph.h	log: fix memory leak if --graph is passed multiple times	2022-02-11 10:06:40 -08:00
grep.c	Merge branch 'rs/pcre-invalid-utf8-fix-fix'	2022-02-25 15:47:38 -08:00
grep.h	grep: simplify config parsing and option parsing	2022-02-15 18:00:50 -08:00
hash-lookup.c	…
hash-lookup.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	Merge branch 'jh/builtin-fsmonitor-part2'	2022-04-04 10:56:24 -07:00
help.h	help: add --no-[external-commands\|aliases] for use with --all	2022-02-23 13:41:37 -08:00
hex.c	…
hook.c	Merge branch 'ab/hooks-regression-fix'	2022-06-13 15:53:41 -07:00
hook.h	hooks: fix an obscure TOCTOU "did we just run a hook?" race	2022-03-07 13:00:53 -08:00
http-backend.c	run-command API: rename "env_array" to "env"	2022-06-02 14:31:16 -07:00
http-fetch.c	Merge branch 'ep/maint-equals-null-cocci' for maint-2.35	2022-05-02 10:06:04 -07:00
http-push.c	Merge branch 'ab/plug-leak-in-revisions'	2022-06-07 14:10:56 -07:00
http-walker.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
http.c	i18n: fix mismatched camelCase config variables	2022-06-17 10:38:26 -07:00
http.h	http: make http_get_file() external	2022-05-16 15:02:09 -07:00
ident.c	date API: create a date.h, split from cache.h	2022-02-16 09:40:00 -08:00
imap-send.c	Merge branch 'bc/csprng-mktemps'	2022-04-06 15:21:59 -07:00
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
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	pack-objects: lazily set up "struct rev_info", don't leak	2022-03-28 09:57:21 -07:00
list-objects-filter-options.h	pack-objects: lazily set up "struct rev_info", don't leak	2022-03-28 09:57:21 -07:00
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	list-objects: handle NULL function pointers	2022-03-09 10:25:27 -08:00
list-objects.h	list-objects: consolidate traverse_commit_list[_filtered]	2022-03-09 10:25:27 -08:00
list.h	…
ll-merge.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
ll-merge.h	ll-merge: make callers responsible for showing warnings	2022-02-02 10:02:27 -08:00
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
log-tree.h	…
ls-refs.c	i18n: factorize "invalid value" messages	2022-02-04 13:58:28 -08:00
ls-refs.h	…
mailinfo.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
mailinfo.h	…
mailmap.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
mailmap.h	…
match-trees.c	object-file API: have write_object_file() take "enum object_type"	2022-02-25 17:16:31 -08:00
mem-pool.c	mem-pool: don't assume uintmax_t is aligned enough for all types	2022-01-24 10:26:40 -08:00
mem-pool.h	…
merge-blobs.c	ll-merge: make callers responsible for showing warnings	2022-02-02 10:02:27 -08:00
merge-blobs.h	…
merge-ort-wrappers.c	…
merge-ort-wrappers.h	…
merge-ort.c	merge-ort: optionally produce machine-readable output	2022-06-22 16:10:06 -07:00
merge-ort.h	merge-ort: optionally produce machine-readable output	2022-06-22 16:10:06 -07:00
merge-recursive.c	Merge branch 'ab/plug-leak-in-revisions'	2022-06-07 14:10:56 -07:00
merge-recursive.h	merge-ort: format messages slightly different for use in headers	2022-02-02 10:02:27 -08:00
merge.c	…
mergesort.c	mergesort: avoid left shift overflow	2021-11-18 12:42:06 -08:00
mergesort.h	…
midx.c	Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint	2022-06-08 14:27:53 -07:00
midx.h	midx: read `RIDX` chunk when present	2022-01-27 12:07:53 -08:00
name-hash.c	…
notes-cache.c	object-file API: have write_object_file() take "enum object_type"	2022-02-25 17:16:31 -08:00
notes-cache.h	…
notes-merge.c	misc *.c: use designated initializers for struct assignments	2022-03-17 10:36:42 -07:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	object-file API: have write_object_file() take "enum object_type"	2022-02-25 17:16:31 -08:00
notes.h	…
object-file.c	Merge branch 'ab/env-array'	2022-06-10 15:04:13 -07:00
object-name.c	object-name: diagnose trees in index properly	2022-04-26 13:56:39 -07:00
object-store.h	Merge branch 'tb/cruft-packs'	2022-06-03 14:30:37 -07:00
object.c	object-file API: have hash_object_file() take "enum object_type"	2022-02-25 17:16:32 -08:00
object.h	reflog: libify delete reflog function and helpers	2022-03-02 15:24:47 -08:00
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-bitmap: drop filter in prepare_bitmap_walk()	2022-03-09 10:25:27 -08:00
pack-check.c	object-file API: have hash_object_file() take "enum object_type"	2022-02-25 17:16:32 -08:00
pack-mtimes.c	pack-mtimes: avoid closing a bogus file descriptor	2022-06-16 13:22:03 -07:00
pack-mtimes.h	pack-mtimes: support reading .mtimes files	2022-05-26 15:48:26 -07:00
pack-objects.c	pack-mtimes: support writing pack .mtimes files	2022-05-26 15:48:26 -07:00
pack-objects.h	pack-mtimes: support writing pack .mtimes files	2022-05-26 15:48:26 -07:00
pack-revindex.c	midx: read `RIDX` chunk when present	2022-01-27 12:07:53 -08:00
pack-revindex.h	…
pack-write.c	pack-write: drop always-NULL parameter	2022-06-16 11:59:55 -07:00
pack.h	pack-mtimes: support writing pack .mtimes files	2022-05-26 15:48:26 -07:00
packfile.c	Merge branch 'tb/cruft-packs'	2022-06-03 14:30:37 -07:00
packfile.h	Merge branch 'tb/pack-revindex-on-disk-cleanup'	2021-12-15 09:39:50 -08:00
pager.c	run-command API: rename "env_array" to "env"	2022-06-02 14:31:16 -07:00
parallel-checkout.c	i18n: factorize "invalid value" messages	2022-02-04 13:58:28 -08:00
parallel-checkout.h	…
parse-options-cb.c	branch: add flags and config to inherit tracking	2021-12-20 22:40:21 -08:00
parse-options.c	parse-options.c: use optbug() instead of BUG() "opts" check	2022-06-02 12:51:35 -07:00
parse-options.h	Merge branch 'ja/i18n-common-messages'	2022-02-25 15:47:35 -08:00
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	repository.c: free the "path cache" in repo_clear()	2022-03-04 13:24:19 -08:00
pathspec.c	Merge branch 'jc/all-negative-pathspec'	2022-06-07 14:10:59 -07:00
pathspec.h	pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)	2021-12-07 12:31:17 -08:00
pkt-line.c	fetch-pack: redact packfile urls in traces	2021-11-11 10:07:43 -08:00
pkt-line.h	fetch-pack: redact packfile urls in traces	2021-11-11 10:07:43 -08:00
preload-index.c	…
pretty.c	Merge branch 'es/pretty-describe-more'	2021-12-15 09:39:48 -08:00
pretty.h	date API: create a date.h, split from cache.h	2022-02-16 09:40:00 -08:00
prio-queue.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
prio-queue.h	…
progress.c	progress API: unify stop_progress{,_msg}(), fix trace2 bug	2022-02-03 15:39:59 -08:00
progress.h	progress API: unify stop_progress{,_msg}(), fix trace2 bug	2022-02-03 15:39:59 -08:00
promisor-remote.c	Merge branch 'ab/env-array'	2022-06-10 15:04:13 -07:00
promisor-remote.h	…
prompt.c	run-command API users: use strvec_push(), not argv construction	2021-11-25 22:15:07 -08:00
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: report precise timestamps from objects in cruft packs	2022-05-26 15:48:26 -07:00
reachable.h	builtin/pack-objects.c: --cruft with expiration	2022-05-26 15:48:26 -07:00
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	revisions API: release "reflog_info" in release revisions()	2022-04-13 23:56:10 -07:00
reflog-walk.h	revisions API: release "reflog_info" in release revisions()	2022-04-13 23:56:10 -07:00
reflog.c	Merge branch 'ab/reflog-parse-options'	2022-04-04 10:56:21 -07:00
reflog.h	reflog: libify delete reflog function and helpers	2022-03-02 15:24:47 -08:00
refs.c	clone: die() instead of BUG() on bad refs	2022-04-25 11:05:28 -07:00
refs.h	Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'"	2022-04-13 15:51:33 -07:00
refspec.c	refspec.c: use designated initializers for "struct refspec_item"	2022-02-24 15:59:53 -08:00
refspec.h	…
remote-curl.c	Merge branch 'rc/fetch-refetch'	2022-04-04 10:56:23 -07:00
remote.c	i18n: fix mismatched camelCase config variables	2022-06-17 10:38:26 -07:00
remote.h	remote: allow relative_url() to return an absolute url	2022-05-16 15:02:10 -07:00
replace-object.c	…
replace-object.h	…
repo-settings.c	compat/fsmonitor/fsm-listen-win32: stub in backend for Windows	2022-03-25 16:04:15 -07:00
repository.c	Merge branch 'ab/plug-random-leaks'	2022-03-13 22:56:18 +00:00
repository.h	Merge branch 'jh/builtin-fsmonitor-part2'	2022-04-04 10:56:24 -07:00
rerere.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
rerere.h	…
reset.c	Merge branch 'pw/use-in-process-checkout-in-rebase'	2022-02-18 13:53:27 -08:00
reset.h	rebase --apply: set ORIG_HEAD correctly	2022-01-26 12:08:53 -08:00
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.c: remove unnecessary include	2022-04-06 09:42:12 -07:00
serve.h	…
server-info.c	…
setup.c	setup: don't die if realpath(3) fails on getcwd(3)	2022-05-24 22:08:31 -07:00
sh-i18n--envsubst.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
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	Makefile: add "po-init" rule to initialize po/XX.po	2022-05-26 10:32:57 -07:00
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: it really is incompatible with the sparse index	2022-01-23 17:06:23 -08:00
split-index.h	…
stable-qsort.c	stable-qsort: avoid using potentially unaligned access	2022-01-07 15:48:40 -08:00
strbuf.c	gettext API users: don't explicitly cast ngettext()'s "n"	2022-03-07 11:57:52 -08:00
strbuf.h	strbuf.h: use BUG(...) not die("BUG: ...")	2021-12-07 12:31:16 -08:00
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	string-list API: change "nr" and "alloc" to "size_t"	2022-03-07 12:02:04 -08:00
strmap.c	…
strmap.h	…
strvec.c	…
strvec.h	…
sub-process.c	run-command API: remove "argv" member, always use "args"	2021-11-25 22:15:07 -08:00
sub-process.h	…
submodule-config.c	i18n: fix mismatched camelCase config variables	2022-06-17 10:38:26 -07:00
submodule-config.h	Merge branch 'pb/submodule-recurse-mode-enum'	2022-05-20 15:26:53 -07:00
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	symlinks: do not include startup_info->original_cwd in dir removal	2021-12-09 13:33:13 -08:00
tag.c	ssh signing: make verify-tag consider key lifetime	2021-12-09 13:38:04 -08:00
tag.h	…
tar.h	…
tempfile.c	tempfile: add mks_tempfile_dt()	2022-04-20 16:17:33 -07:00
tempfile.h	tempfile: add mks_tempfile_dt()	2022-04-20 16:17:33 -07:00
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	log: clean unneeded objects during `log --remerge-diff`	2022-02-02 10:02:27 -08:00
tmp-objdir.h	log: clean unneeded objects during `log --remerge-diff`	2022-02-02 10:02:27 -08:00
trace.c	C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code	2022-02-21 19:14:19 -08:00
trace.h	C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code	2022-02-21 19:14:19 -08:00
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	push: new config option "push.autoSetupRemote" supports "simple" push	2022-04-29 11:20:55 -07:00
tree-diff.c	pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)	2021-12-07 12:31:17 -08:00
tree-walk.c	object-file API: pass an enum to read_object_with_reference()	2022-02-25 17:16:32 -08:00
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	unpack-trees: refuse to remove startup_info->original_cwd	2021-12-09 13:33:12 -08:00
upload-pack.c	upload-pack: look up "want" lines via commit-graph	2022-03-01 10:13:45 -08:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	urlmatch.c: add and use a *_release() function	2022-03-04 13:24:18 -08:00
urlmatch.h	urlmatch.c: add and use a *_release() function	2022-03-04 13:24:18 -08:00
usage.c	bug_fl(): correctly initialize trace2 va_list	2022-06-16 13:28:22 -07:00
userdiff.c	Merge branch 'jd/userdiff-kotlin'	2022-03-23 14:09:29 -07:00
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	…
walker.h	…
wildmatch.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
wildmatch.h	…
worktree.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
worktree.h	worktree: create init_worktree_config()	2022-02-08 09:49:20 -08:00
wrap-for-bin.sh	…
wrapper.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
write-or-die.c	core.fsync: introduce granular fsync control infrastructure	2022-03-10 15:10:22 -08:00
ws.c	…
wt-status.c	Merge branch 'ab/env-array'	2022-06-10 15:04:13 -07:00
wt-status.h	…
xdiff-interface.c	Merge branch 'ep/maint-equals-null-cocci' for maint-2.35	2022-05-02 10:06:04 -07:00
xdiff-interface.h	…
zlib.c	…

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.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