A fork of Git containing Microsoft-specific patches.

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

Phillip Wood 4496526f80 xdiff: implement a zealous diff3, or "zdiff3" "zdiff3" is identical to ordinary diff3 except that it allows compaction of common lines on the two sides of history at the beginning or end of the conflict hunk. For example, the following diff3 conflict: 1 2 3 4 <<<<<< A B C D E \|\|\|\|\|\| 5 6 ====== A X C Y E >>>>>> 7 8 9 has common lines 'A', 'C', and 'E' on the two sides. With zdiff3, one would instead get the following conflict: 1 2 3 4 A <<<<<< B C D \|\|\|\|\|\| 5 6 ====== X C Y >>>>>> E 7 8 9 Note that the common lines, 'A', and 'E' were moved outside the conflict. Unlike with the two-way conflicts from the 'merge' conflictStyle, the zdiff3 conflict is NOT split into multiple conflict regions to allow the common 'C' lines to be shown outside a conflict, because zdiff3 shows the base version too and the base version cannot be reasonably split. Note also that the removing of lines common to the two sides might make the remaining text inside the conflict region match the base text inside the conflict region (for example, if the diff3 conflict had '5 6 E' on the right side of the conflict, then the common line 'E' would be moved outside and both the base and right side's remaining conflict text would be the lines '5' and '6'). This has the potential to surprise users and make them think there should not have been a conflict, but there definitely was a conflict and it should remain. Based-on-patch-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Co-authored-by: Elijah Newren <newren@gmail.com> Signed-off-by: Phillip Wood <phillip.wood123@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2021-12-01 14:45:58 -08:00
.github	Merge branch 'js/windows-ci-path-fix'	2021-10-18 15:47:58 -07:00
Documentation	The first batch to start the current cycle	2021-11-29 15:41:51 -08:00
block-sha1	…
builtin	xdiff: implement a zealous diff3, or "zdiff3"	2021-12-01 14:45:58 -08:00
ci	Merge branch 'cb/ci-build-pedantic' into maint	2021-10-12 13:51:31 -07:00
compat	Merge branch 'jc/unsetenv-returns-an-int'	2021-11-29 15:41:48 -08:00
contrib	xdiff: implement a zealous diff3, or "zdiff3"	2021-12-01 14:45:58 -08:00
ewah	…
git-gui	…
gitk-git	…
gitweb	Merge branch 'gh/gitweb-branch-sort'	2021-09-10 11:46:32 -07:00
mergetools	mergetools/xxdiff: prevent segfaults from stopping difftool	2021-10-13 11:04:04 -07:00
negotiator	…
perl	Merge branch 'ab/send-email-optim'	2021-07-22 13:05:54 -07:00
po	l10n: pl: 2.34.0 round 3	2021-11-14 15:19:23 +01:00
ppc	…
refs	Merge branch 'ab/refs-errno-cleanup'	2021-11-29 15:41:45 -08:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	xdiff: implement a zealous diff3, or "zdiff3"	2021-12-01 14:45:58 -08:00
templates	…
trace2	Merge branch 'js/trace2-raise-format-version'	2021-11-12 15:29:25 -08:00
xdiff	xdiff: implement a zealous diff3, or "zdiff3"	2021-12-01 14:45:58 -08:00
.cirrus.yml	ci: update freebsd 12 cirrus job	2021-08-12 14:00:52 -07:00
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	Merge branch 'js/retire-preserve-merges'	2021-10-18 15:47:56 -07:00
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.34.1	2021-11-24 10:55:13 -08:00
INSTALL	INSTALL: mention that we need libcurl 7.19.4 or newer to build	2021-09-13 10:39:03 -07:00
LGPL-2.1	…
Makefile	Merge branch 'ab/sh-retire-helper-functions'	2021-11-29 15:41:50 -08:00
README.md	…
RelNotes	Git 2.34.1	2021-11-24 10:55:13 -08:00
SECURITY.md	…
abspath.c	…
aclocal.m4	…
add-interactive.c	.h: move some _INIT to designated initializers	2021-09-27 14:48:00 -07:00
add-interactive.h	…
add-patch.c	…
advice.c	Merge branch 'ds/add-rm-with-sparse-index'	2021-10-13 15:15:56 -07:00
advice.h	Merge branch 'en/pull-conflicting-options' into maint	2021-10-12 13:51:36 -07:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'jc/trivial-threeway-binary-merge' into maint	2021-10-12 13:51:45 -07:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	archive: convert queue_directory to struct object_id	2021-08-27 14:19:00 -07:00
archive.h	…
attr.c	attr: be careful about sparse directories	2021-09-07 22:41:10 -07:00
attr.h	…
banned.h	…
base85.c	…
bisect.c	bisect: simplify return code from bisect_checkout()	2021-07-28 10:57:37 -07:00
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	advice: remove read uses of most global `advice_` variables	2021-08-25 12:07:52 -07:00
branch.h	…
builtin.h	builtin.h: remove cmd_tar_tree() declaration	2021-10-01 14:39:46 -07:00
bulk-checkin.c	pack-write: split up finish_tmp_packfile() function	2021-09-09 18:23:11 -07:00
bulk-checkin.h	…
bundle.c	bundle API: change "flags" to be "extra_index_pack_args"	2021-09-07 10:59:23 -07:00
bundle.h	bundle API: change "flags" to be "extra_index_pack_args"	2021-09-07 10:59:23 -07:00
cache-tree.c	Merge branch 'pw/sparse-cache-tree-verify-fix'	2021-10-25 16:06:57 -07:00
cache-tree.h	…
cache.h	Merge branch 'ab/fix-commit-error-message-upon-unwritable-object-store'	2021-10-25 16:06:57 -07:00
cbtree.c	…
cbtree.h	cbtree.h: define cb_init() in terms of CBTREE_INIT	2021-09-27 14:48:00 -07:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
checkout.c	.[ch] _INIT macros: use { 0 } for a "zero out" idiom	2021-09-27 14:47:59 -07:00
checkout.h	…
chunk-format.c	…
chunk-format.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	command-list.txt: remove 'sparse-index' from main help	2021-10-25 09:10:43 -07:00
commit-graph.c	Merge branch 'js/run-command-close-packs'	2021-09-20 15:20:45 -07:00
commit-graph.h	revision: avoid hitting packfiles when commits are in commit-graph	2021-08-09 09:51:12 -07:00
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	advice: move advice.graftFileDeprecated squashing to commit.[ch]	2021-08-25 12:07:52 -07:00
commit.h	advice: move advice.graftFileDeprecated squashing to commit.[ch]	2021-08-25 12:07:52 -07:00
common-main.c	…
config.c	config.c: don't leak memory in handle_path_include()	2021-10-21 16:26:45 -07:00
config.h	Merge branch 'ab/retire-git-config-key-is-valid'	2021-10-11 10:21:47 -07:00
config.mak.dev	Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better	2021-09-28 21:15:53 -07:00
config.mak.in	…
config.mak.uname	git-sh-setup: remove "sane_grep", it's not needed anymore	2021-10-21 16:17:57 -07:00
configure.ac	git-sh-setup: remove "sane_grep", it's not needed anymore	2021-10-21 16:17:57 -07:00
connect.c	Merge branch 'ah/connect-parse-feature-v0-fix' into maint	2021-10-12 13:51:49 -07:00
connect.h	…
connected.c	Merge branch 'ps/connectivity-optim'	2021-11-12 15:29:24 -08:00
connected.h	connected: refactor iterator to return next object ID directly	2021-09-01 12:43:56 -07:00
convert.c	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
convert.h	…
copy.c	…
credential.c	urlmatch.[ch]: add and use URLMATCH_CONFIG_INIT	2021-10-01 14:22:51 -07:00
credential.h	…
csum-file.c	use xopen() to handle fatal open(2) failures	2021-08-25 14:39:08 -07:00
csum-file.h	…
ctype.c	…
daemon.c	Merge branch 'ab/pkt-line-cleanup'	2021-10-25 16:07:00 -07:00
date.c	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	odb: guard against data loss checking out a huge file	2021-11-03 11:22:27 -07:00
detect-compiler	build: catch clang that identifies itself as "$VENDOR clang"	2021-08-06 13:35:37 -07:00
diff-delta.c	…
diff-lib.c	Merge branch 'dd/diff-files-unmerged-fix' into maint	2021-10-12 13:51:40 -07:00
diff-merges.c	diff-index: restore -c/--cc options handling	2021-09-07 11:11:35 -07:00
diff-merges.h	diff-index: restore -c/--cc options handling	2021-09-07 11:11:35 -07:00
diff-no-index.c	…
diff.c	.[ch] _INIT macros: use { 0 } for a "zero out" idiom	2021-09-27 14:47:59 -07:00
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	Merge branch 'en/ort-perf-batch-15'	2021-08-24 15:32:39 -07:00
diffcore-rotate.c	…
diffcore.h	merge-ort: store filepairs and filespecs in our mem_pool	2021-07-30 09:01:19 -07:00
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'ds/add-rm-with-sparse-index' into maint	2021-11-23 14:48:11 -08:00
dir.h	Merge branch 'ds/sparse-index-ignored-files'	2021-09-20 15:20:44 -07:00
editor.c	Merge branch 'jc/save-restore-terminal-revert' into maint	2021-11-23 14:48:15 -08: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 'jk/ref-paranoia'	2021-10-11 10:21:47 -07:00
environment.h	…
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	repo-settings.c: simplify the setup	2021-09-22 13:15:00 -07:00
fetch-negotiator.h	…
fetch-pack.c	fetch-pack: optimize loading of refs via commit graph	2021-09-01 12:43:56 -07:00
fetch-pack.h	…
fmt-merge-msg.c	Merge branch 'fs/ssh-signing'	2021-10-25 16:06:58 -07:00
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
generate-configlist.sh	…
generate-hooklist.sh	hook-list.h: add a generated list of hooks, like config-list.h	2021-09-27 09:44:54 -07:00
gettext.c	…
gettext.h	gettext: remove optional non-standard parens in N_() definition	2021-09-03 11:40:30 -07:00
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	Merge branch 'mr/bisect-in-c-4'	2021-09-23 13:44:48 -07:00
git-compat-util.h	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
git-curl-compat.h	http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors	2021-09-27 10:58:07 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	git-cvsserver: protect against NULL in crypt(3)	2021-09-16 20:47:23 -07:00
git-difftool--helper.sh	…
git-filter-branch.sh	git-sh-setup: remove "sane_grep", it's not needed anymore	2021-10-21 16:17:57 -07:00
git-instaweb.sh	git-sh-setup: remove "sane_grep", it's not needed anymore	2021-10-21 16:17:57 -07:00
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	send-email docs: add format-patch options	2021-10-28 09:06:15 -07:00
git-sh-i18n.sh	git-sh-i18n: remove unused eval_ngettext()	2021-10-21 16:04:29 -07:00
git-sh-setup.sh	Merge branch 'ab/sh-retire-helper-functions'	2021-11-29 15:41:50 -08:00
git-submodule.sh	Merge branch 'ab/unused-script-helpers'	2021-09-23 13:44:47 -07:00
git-svn.perl	git-svn: drop support for `--preserve-merges`	2021-09-07 21:45:33 -07:00
git-web--browse.sh	…
git.c	Merge branch 'js/retire-preserve-merges'	2021-10-18 15:47:56 -07:00
git.rc	…
gpg-interface.c	Merge branch 'jx/message-fixes'	2021-11-03 13:32:28 -07:00
gpg-interface.h	ssh signing: provide a textual signing_key_id	2021-09-10 14:15:52 -07:00
graph.c	…
graph.h	…
grep.c	Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data"	2021-11-19 09:10:27 -08:00
grep.h	Merge branch 'hm/paint-hits-in-log-grep'	2021-11-01 13:48:08 -07:00
hash-lookup.c	…
hash-lookup.h	…
hash.h	oidtree: avoid unaligned access to crit-bit tree	2021-08-15 13:13:50 -07:00
hashmap.c	…
hashmap.h	…
help.c	help: move column config discovery to help.c library	2021-09-23 10:30:43 -07:00
help.h	help: move column config discovery to help.c library	2021-09-23 10:30:43 -07:00
hex.c	…
hook.c	hook.c: add a hook_exists() wrapper and use it in bugreport.c	2021-09-27 09:44:54 -07:00
hook.h	hook.c: add a hook_exists() wrapper and use it in bugreport.c	2021-09-27 09:44:54 -07:00
http-backend.c	http-backend: remove a duplicated code branch	2021-10-25 08:56:01 -07:00
http-fetch.c	…
http-push.c	http: rename CURLOPT_FILE to CURLOPT_WRITEDATA	2021-07-30 16:01:54 -07:00
http-walker.c	http: rename CURLOPT_FILE to CURLOPT_WRITEDATA	2021-07-30 16:01:54 -07:00
http.c	Merge branch 'ab/designated-initializers-more'	2021-10-18 15:47:57 -07:00
http.h	http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors	2021-09-27 10:58:07 -07:00
ident.c	…
imap-send.c	http: centralize the accounting of libcurl dependencies	2021-09-13 10:39:04 -07:00
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.c: rename "traverse_trees_and_blobs" to "traverse_non_commits"	2021-08-12 13:08:30 -07:00
list-objects.h	…
list.h	.h: move some _INIT to designated initializers	2021-09-27 14:48:00 -07:00
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	.[ch] _INIT macros: use { 0 } for a "zero out" idiom	2021-09-27 14:47:59 -07:00
log-tree.c	Merge branch 'fs/ssh-signing'	2021-10-25 16:06:58 -07:00
log-tree.h	log-tree.h: remove unused function declarations	2021-10-01 14:39:46 -07:00
ls-refs.c	Merge branch 'jk/ref-paranoia'	2021-10-11 10:21:47 -07:00
ls-refs.h	serve.[ch]: don't pass "struct strvec *keys" to commands	2021-08-05 08:59:37 -07:00
mailinfo.c	…
mailinfo.h	…
mailmap.c	Merge branch 'ab/mailmap-leakfix' into maint	2021-10-12 13:51:30 -07:00
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 'jt/no-abuse-alternate-odb-for-submodules'	2021-10-25 16:06:56 -07:00
merge-ort.h	…
merge-recursive.c	Merge branch 'jt/no-abuse-alternate-odb-for-submodules'	2021-10-25 16:06:56 -07:00
merge-recursive.h	…
merge.c	unpack-trees: introduce preserve_ignored to unpack_trees_options	2021-09-27 13:38:37 -07:00
mergesort.c	mergesort: use ranks stack	2021-10-01 12:43:09 -07:00
mergesort.h	…
midx.c	Merge branch 'tb/plug-pack-bitmap-leaks'	2021-11-29 15:41:49 -08:00
midx.h	midx.c: write MIDX filenames to strbuf	2021-10-28 15:32:14 -07:00
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	advice: remove read uses of most global `advice_` variables	2021-08-25 12:07:52 -07:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-file.c	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
object-name.c	advice: remove read uses of most global `advice_` variables	2021-08-25 12:07:52 -07:00
object-store.h	Merge branch 'ab/fix-commit-error-message-upon-unwritable-object-store'	2021-10-25 16:06:57 -07:00
object.c	Merge branch 'ab/fsck-unexpected-type'	2021-10-25 16:06:56 -07:00
object.h	.[ch] _INIT macros: use { 0 } for a "zero out" idiom	2021-09-27 14:47:59 -07:00
oid-array.c	…
oid-array.h	.[ch] _INIT macros: use { 0 } for a "zero out" idiom	2021-09-27 14:47:59 -07:00
oidmap.c	…
oidmap.h	…
oidset.c	oidset: make oidset_size() an inline function	2021-09-12 16:14:32 -07:00
oidset.h	oidset: make oidset_size() an inline function	2021-09-12 16:14:32 -07:00
oidtree.c	oidtree: avoid unaligned access to crit-bit tree	2021-08-15 13:13:50 -07:00
oidtree.h	…
pack-bitmap-write.c	pack-bitmap: read multi-pack bitmaps	2021-09-01 13:56:43 -07:00
pack-bitmap.c	pack-bitmap.c: more aggressively free in free_bitmap_index()	2021-10-28 15:32:14 -07:00
pack-bitmap.h	Merge branch 'tb/repack-write-midx'	2021-10-18 15:47:57 -07:00
pack-check.c	Merge branch 'ab/fsck-unexpected-type'	2021-10-25 16:06:56 -07:00
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	midx.c: write MIDX filenames to strbuf	2021-10-28 15:32:14 -07:00
pack-revindex.h	pack-revindex.h: correct the time complexity descriptions	2021-09-15 22:16:25 -07:00
pack-write.c	Merge branch 'tb/pack-finalize-ordering' into maint	2021-10-12 13:51:46 -07:00
pack.h	pack-write: split up finish_tmp_packfile() function	2021-09-09 18:23:11 -07:00
packfile.c	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
packfile.h	packfile: convert has_packed_and_bad() to object_id	2021-09-12 16:14:32 -07:00
pager.c	…
parallel-checkout.c	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	Merge branch 'ab/parse-options-cleanup'	2021-11-09 13:19:06 -08:00
parse-options.h	Merge branch 'ab/parse-options-cleanup'	2021-11-09 13:19:06 -08:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'lh/systemd-timers'	2021-09-20 15:20:40 -07:00
path.h	.[ch] _INIT macros: use { 0 } for a "zero out" idiom	2021-09-27 14:47:59 -07:00
pathspec.c	add: skip tracked paths outside sparse-checkout cone	2021-09-28 10:31:02 -07:00
pathspec.h	…
pkt-line.c	Merge branch 'ab/pkt-line-cleanup'	2021-10-25 16:07:00 -07:00
pkt-line.h	Merge branch 'ab/pkt-line-cleanup'	2021-10-25 16:07:00 -07:00
preload-index.c	…
pretty.c	Merge branch 'hm/paint-hits-in-log-grep'	2021-11-01 13:48:08 -07:00
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	Merge branch 'ab/serve-cleanup'	2021-09-20 15:20:43 -07:00
protocol-caps.h	serve.[ch]: don't pass "struct strvec *keys" to commands	2021-08-05 08:59:37 -07:00
protocol.c	connect, protocol: log negotiated protocol version	2021-08-10 11:46:33 -07:00
protocol.h	…
prune-packed.c	…
prune-packed.h	…
quote.c	ref-filter: --format=%(raw) support --perl	2021-07-26 12:01:25 -07:00
quote.h	Merge branch 'zh/ref-filter-raw-data'	2021-08-24 15:32:37 -07:00
range-diff.c	Merge branch 'rs/range-diff-avoid-segfault-with-I' into maint	2021-10-12 13:51:45 -07:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'rs/add-dry-run-without-objects'	2021-10-25 16:06:57 -07:00
rebase-interactive.c	rebase: remove a no-longer-used function	2021-09-07 21:45:33 -07:00
rebase-interactive.h	rebase: remove a no-longer-used function	2021-09-07 21:45:33 -07:00
rebase.c	pull: remove support for `--rebase=preserve`	2021-09-07 21:45:32 -07:00
rebase.h	pull: remove support for `--rebase=preserve`	2021-09-07 21:45:32 -07:00
ref-filter.c	Merge branch 'jc/fix-ref-sorting-parse'	2021-11-29 15:41:47 -08:00
ref-filter.h	for-each-ref: delay parsing of --sort=<atom> options	2021-10-20 14:33:07 -07:00
reflog-walk.c	refs: make repo_dwim_log() accept a NULL oid	2021-08-25 13:27:37 -07:00
reflog-walk.h	…
refs.c	Merge branch 'ab/refs-errno-cleanup'	2021-11-29 15:41:45 -08:00
refs.h	refs API: post-migration API renaming [2/2]	2021-10-16 11:17:04 -07:00
refspec.c	…
refspec.h	…
remote-curl.c	Merge branch 'ab/pkt-line-cleanup'	2021-10-25 16:07:00 -07:00
remote.c	.[ch] _INIT macros: use { 0 } for a "zero out" idiom	2021-09-27 14:47:59 -07:00
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	repository.h: don't use a mix of int and bitfields	2021-09-22 13:15:00 -07:00
repository.c	Merge branch 'jt/add-submodule-odb-clean-up'	2021-10-06 13:40:11 -07:00
repository.h	Merge branch 'ab/repo-settings-cleanup'	2021-10-06 13:40:11 -07:00
rerere.c	…
rerere.h	…
reset.c	Change unpack_trees' 'reset' flag into an enum	2021-09-27 13:38:37 -07:00
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'ps/connectivity-optim'	2021-11-12 15:29:24 -08:00
revision.h	Merge branch 'jt/add-submodule-odb-clean-up'	2021-10-06 13:40:11 -07:00
run-command.c	Merge branch 'vd/pthread-setspecific-g11-fix' into maint	2021-11-04 12:24:20 -07:00
run-command.h	Merge branch 'jh/builtin-fsmonitor-part1'	2021-10-13 15:15:58 -07:00
send-pack.c	Merge branch 'fs/ssh-signing'	2021-10-25 16:06:58 -07:00
send-pack.h	…
sequencer.c	Merge branch 'ab/refs-errno-cleanup'	2021-11-29 15:41:45 -08:00
sequencer.h	Merge branch 'js/retire-preserve-merges'	2021-10-18 15:47:56 -07:00
serve.c	serve: reject commands used as capabilities	2021-09-15 12:25:19 -07:00
serve.h	serve.[ch]: remove "serve_options", split up --advertise-refs code	2021-08-05 08:59:37 -07:00
server-info.c	…
setup.c	setup: use xopen and xdup in sanitize_stdfds	2021-09-09 17:40:02 -07:00
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	.h: move some _INIT to designated initializers	2021-09-27 14:48:00 -07:00
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	Merge branch 'jh/builtin-fsmonitor-part1'	2021-10-13 15:15:58 -07:00
sparse-index.c	Merge branch 'ds/sparse-index-ignored-files'	2021-09-20 15:20:44 -07:00
sparse-index.h	sparse-index: add SPARSE_INDEX_MEMORY_ONLY flag	2021-09-07 22:41:10 -07:00
split-index.c	…
split-index.h	…
stable-qsort.c	…
strbuf.c	merge-{ort,recursive}: remove add_submodule_odb()	2021-10-08 15:06:06 -07:00
strbuf.h	Merge branch 'jt/no-abuse-alternate-odb-for-submodules'	2021-10-25 16:06:56 -07:00
streaming.c	object-file.c: stop dying in parse_loose_header()	2021-10-01 15:06:00 -07:00
streaming.h	…
string-list.c	string-list.[ch]: remove string_list_init() compatibility function	2021-09-28 14:43:38 -07:00
string-list.h	string-list.[ch]: remove string_list_init() compatibility function	2021-09-28 14:43:38 -07:00
strmap.c	…
strmap.h	…
strvec.c	…
strvec.h	.h: move some _INIT to designated initializers	2021-09-27 14:48:00 -07:00
sub-process.c	…
sub-process.h	…
submodule-config.c	submodule-config: pass repo upon blob config read	2021-09-08 11:48:09 -07:00
submodule-config.h	submodule-config.h: remove unused SUBMODULE_INIT macro	2021-09-27 14:47:59 -07:00
submodule.c	Merge branch 'jt/no-abuse-alternate-odb-for-submodules'	2021-10-25 16:06:56 -07:00
submodule.h	.h: move some _INIT to designated initializers	2021-09-27 14:48:00 -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	.h: move some _INIT to designated initializers	2021-09-27 14:48:00 -07:00
trace2.c	trace2: add trace2_child_ready() to report on background children	2021-09-20 08:57:58 -07:00
trace2.h	Merge branch 'jh/builtin-fsmonitor-part1'	2021-10-13 15:15:58 -07:00
trailer.c	…
trailer.h	…
transport-helper.c	Merge branch 'jk/http-push-status-fix'	2021-10-29 15:43:12 -07:00
transport-internal.h	transport: rename "fetch" in transport_vtable to "fetch_refs"	2021-08-05 08:59:36 -07:00
transport.c	hook.[ch]: move find_hook() from run-command.c to hook.c	2021-09-27 09:44:54 -07:00
transport.h	.h: move some _INIT to designated initializers	2021-09-27 14:48:00 -07:00
tree-diff.c	tree-diff: fix leak when not HAVE_ALLOCA_H	2021-09-16 13:43:42 -07:00
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unicode-width.h	unicode: update the width tables to Unicode 14	2021-09-17 17:26:21 -07:00
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unix-stream-server.c	…
unix-stream-server.h	…
unpack-trees.c	Merge branch 'ab/unpack-trees-leakfix'	2021-10-25 16:06:56 -07:00
unpack-trees.h	Change unpack_trees' 'reset' flag into an enum	2021-09-27 13:38:37 -07:00
upload-pack.c	Merge branch 'ab/serve-cleanup'	2021-09-20 15:20:43 -07:00
upload-pack.h	serve.[ch]: remove "serve_options", split up --advertise-refs code	2021-08-05 08:59:37 -07:00
url.c	…
url.h	…
urlmatch.c	urlmatch: add underscore to URL_HOST_CHARS	2021-10-12 18:29:25 -07:00
urlmatch.h	urlmatch.[ch]: add and use URLMATCH_CONFIG_INIT	2021-10-01 14:22:51 -07:00
usage.c	…
userdiff.c	userdiff-cpp: back out the digit-separators in numbers	2021-10-25 08:47:44 -07:00
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	refs API: post-migration API renaming [2/2]	2021-10-16 11:17:04 -07:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	wrapper: remove xunsetenv()	2021-10-29 14:59:29 -07:00
write-or-die.c	pkt-line: add stdio packet write functions	2021-09-01 10:20:39 -07:00
ws.c	…
wt-status.c	status: print stash info with --porcelain=v2 --show-stash	2021-10-21 17:24:30 -07:00
wt-status.h	…
xdiff-interface.c	xdiff: implement a zealous diff3, or "zdiff3"	2021-12-01 14:45:58 -08: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). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. 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