A fork of Git containing Microsoft-specific patches.

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

Elijah Newren 5e1ca57a7b merge-ort: defer recursing into directories when merge base is matched When one side of history matches the merge base (including when the merge base has no entry for the given directory), have collect_merge_info_callback() defer recursing into the directory. To ensure those entries are eventually handled, add a call to handled_deferred_entries() in collect_merge_info() after traverse_trees() returns. Note that the condition in collect_merge_info_callback() may look more complicated than necessary at first glance; renames->trivial_merges_okay[side] is always true until handle_deferred_entries() is called, and possible_trivial_merges[side] is always empty right now (and in the future won't be filled until handle_deferred_entries() is called). However, when handle_deferred_entries() calls traverse_trees() for the relevant deferred directories, those traverse_trees() calls will once again end up in collect_merge_info_callback() for all the entries under those subdirectories. The extra conditions are there for such deferred cases and will be used more as we do more with those variables. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2021-07-20 14:47:39 -07:00
.github	…
Documentation	The fifth batch	2021-07-16 17:42:53 -07:00
block-sha1	…
builtin	Merge branch 'ab/struct-init'	2021-07-16 17:42:53 -07:00
ci	Merge branch 'dd/svn-test-wo-locale-a'	2021-07-08 13:14:58 -07:00
compat	Merge branch 'jh/simple-ipc-sans-pthread'	2021-05-22 18:29:01 +09:00
contrib	Merge branch 'js/gfw-system-config-loc-fix'	2021-07-16 17:42:46 -07:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	mergetools/kdiff3: make kdiff3 work on Windows too	2021-06-08 10:26:16 +09:00
negotiator	…
perl	Merge branch 'so/log-m-implies-p'	2021-06-14 13:33:27 +09:00
po	l10n: es: 2.32.0 round 1	2021-06-05 20:06:23 -05:00
ppc	…
refs	Merge branch 'ab/struct-init'	2021-07-16 17:42:53 -07:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	Merge branch 'ds/gender-neutral-doc'	2021-07-16 17:42:53 -07:00
templates	…
trace2	Merge branch 'ab/trace2-squelch-gcc-warning'	2021-06-14 13:33:28 +09:00
xdiff	Merge branch 'ab/pickaxe-pcre2'	2021-07-13 16:52:50 -07:00
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.32	2021-06-06 15:40:01 +09:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'jt/partial-clone-submodule-1'	2021-07-16 17:42:53 -07:00
README.md	…
RelNotes	The first batch post Git 2.32	2021-06-10 12:04:27 +09:00
SECURITY.md	…
abspath.c	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	…
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	string-list.h users: change to use *_{nodup,dup}()	2021-07-01 12:32:22 -07:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	string-list.h users: change to use *_{nodup,dup}()	2021-07-01 12:32:22 -07:00
archive.h	…
attr.c	*: fix typos which duplicate a word	2021-06-14 10:16:06 +09:00
attr.h	…
banned.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	…
branch.h	…
builtin.h	…
bulk-checkin.c	bulk-checkin: make buffer reuse more obvious and safer	2021-06-11 13:01:22 +09:00
bulk-checkin.h	…
bundle.c	bundle: remove "ref_list" in favor of string-list.c API	2021-07-06 12:10:17 -07:00
bundle.h	bundle: remove "ref_list" in favor of string-list.c API	2021-07-06 12:10:17 -07:00
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'mt/parallel-checkout-part-3'	2021-05-16 21:05:23 +09:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	…
checkout.h	…
chunk-format.c	csum-file.h: increase hashfile buffer size	2021-05-19 16:41:21 +09:00
chunk-format.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	Merge branch 'ab/pickaxe-pcre2'	2021-07-13 16:52:50 -07:00
command-list.txt	…
commit-graph.c	commit-graph: rewrite to use checksum_valid()	2021-06-28 20:36:17 -07:00
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'ds/gender-neutral-doc'	2021-07-16 17:42:53 -07:00
commit.h	…
common-main.c	…
config.c	Merge branch 'ds/gender-neutral-doc'	2021-07-16 17:42:53 -07:00
config.h	Merge branch 'ds/gender-neutral-doc'	2021-07-16 17:42:53 -07:00
config.mak.dev	…
config.mak.in	…
config.mak.uname	Merge branch 'js/config-mak-windows-pcre-fix'	2021-07-16 17:42:47 -07:00
configure.ac	…
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
credential.c	.c _init(): define in terms of corresponding *_INIT macro	2021-07-01 12:32:22 -07:00
credential.h	.h: move some _INIT to designated initializers	2021-07-01 12:31:45 -07:00
csum-file.c	Merge branch 'tb/midx-use-checksum'	2021-07-16 17:42:46 -07:00
csum-file.h	Merge branch 'tb/midx-use-checksum'	2021-07-16 17:42:46 -07:00
ctype.c	…
daemon.c	…
date.c	comments: avoid using the gender of our users	2021-06-16 11:25:11 +09:00
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: let "-m" imply "-p"	2021-05-21 09:24:14 +09:00
diff-merges.h	diff-merges: move specific diff-index "-m" handling to diff-index	2021-05-21 09:24:14 +09:00
diff-no-index.c	dir: introduce readdir_skip_dot_and_dotdot() helper	2021-05-27 14:02:37 +09:00
diff.c	Merge branch 'ab/pickaxe-pcre2'	2021-07-13 16:52:50 -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-13'	2021-07-16 17:42:45 -07:00
diffcore-rotate.c	…
diffcore.h	Merge branch 'en/ort-perf-batch-11'	2021-06-14 13:33:27 +09:00
dir-iterator.c	…
dir-iterator.h	…
dir.c	dir.[ch]: replace dir_init() with DIR_INIT	2021-07-01 12:32:22 -07:00
dir.h	dir.[ch]: replace dir_init() with DIR_INIT	2021-07-01 12:32:22 -07:00
editor.c	…
entry.c	string-list.h users: change to use *_{nodup,dup}()	2021-07-01 12:32:22 -07:00
entry.h	…
environment.c	…
environment.h	…
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	fetch-pack: signal v2 server that we are done making requests	2021-05-20 07:38:40 +09:00
fetch-pack.h	…
fmt-merge-msg.c	…
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	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'ew/mmap-failures'	2021-07-16 17:42:47 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	*: fix typos which duplicate a word	2021-06-14 10:16:06 +09:00
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-p4: fix failed submit by skip non-text data files	2021-06-28 09:49:30 -07:00
git-quiltimport.sh	…
git-rebase--preserve-merges.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'ga/send-email-sendmail-cmd'	2021-06-14 13:33:26 +09:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	submodule: remove unnecessary `prefix` based option logic	2021-06-28 20:28:19 -07:00
git-svn.perl	…
git-web--browse.sh	…
git.c	…
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	graph: improve grammar of "invalid color" error message	2021-06-15 12:54:26 +09:00
graph.h	…
grep.c	Merge branch 'rs/grep-parser-fix'	2021-07-13 16:52:53 -07:00
grep.h	…
hash-lookup.c	…
hash-lookup.h	…
hash.h	parallel-checkout: send the new object_id algo field to the workers	2021-05-18 05:38:54 +09:00
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	Merge branch 'cs/http-use-basic-after-failed-negotiate'	2021-05-21 05:49:41 +09:00
http.h	…
ident.c	…
imap-send.c	…
iterator.h	…
json-writer.c	.c _init(): define in terms of corresponding *_INIT macro	2021-07-01 12:32:22 -07:00
json-writer.h	.h: move some _INIT to designated initializers	2021-07-01 12:31:45 -07:00
khash.h	khash: clarify that allocations never fail	2021-07-06 13:07:50 -07:00
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	help: fix small typo in error message	2021-05-21 07:52:10 +09:00
list-objects-filter-options.h	…
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	bitmaps: don't recurse into trees already in the bitmap	2021-06-15 11:13:11 +09:00
list-objects.h	…
list.h	…
ll-merge.c	ll_union_merge(): rename path_unused parameter	2021-06-11 12:37:33 +09:00
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	…
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	Merge branch 'ar/mailinfo-memcmp-to-skip-prefix'	2021-07-08 13:15:03 -07:00
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-ort: defer recursing into directories when merge base is matched	2021-07-20 14:47:39 -07:00
merge-ort.h	merge-ort: avoid accidental API mis-use	2021-05-20 15:40:39 +09:00
merge-recursive.c	Merge branch 'ab/struct-init'	2021-07-16 17:42:53 -07:00
merge-recursive.h	…
merge.c	dir.[ch]: replace dir_init() with DIR_INIT	2021-07-01 12:32:22 -07:00
mergesort.c	…
mergesort.h	…
midx.c	midx: report checksum mismatches during 'verify'	2021-06-28 20:36:17 -07:00
midx.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	dir: introduce readdir_skip_dot_and_dotdot() helper	2021-05-27 14:02:37 +09:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-file.c	Merge branch 'jt/partial-clone-submodule-1'	2021-07-16 17:42:53 -07:00
object-name.c	…
object-store.h	…
object.c	…
object.h	Merge branch 'jt/push-negotiation'	2021-05-16 21:05:22 +09:00
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	…
pack-bitmap.c	bitmaps: don't recurse into trees already in the bitmap	2021-06-15 11:13:11 +09:00
pack-bitmap.h	…
pack-check.c	csum-file: introduce checksum_valid()	2021-06-28 20:36:17 -07:00
pack-objects.c	…
pack-objects.h	pack-objects: move static inline from a header to the sole consumer	2021-05-27 12:14:41 +09:00
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	xmmap: inform Linux users of tuning knobs on ENOMEM	2021-06-29 23:14:25 -07:00
packfile.h	…
pager.c	pager: avoid setting COLUMNS when we're guessing its value	2021-06-28 10:42:10 -07:00
parallel-checkout.c	parallel-checkout: send the new object_id algo field to the workers	2021-05-18 05:38:54 +09:00
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	…
pathspec.h	Merge branch 'ds/gender-neutral-doc'	2021-07-16 17:42:53 -07:00
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 'jt/partial-clone-submodule-1'	2021-07-16 17:42:53 -07:00
promisor-remote.h	promisor-remote: support per-repository config	2021-06-28 09:57:42 -07:00
prompt.c	…
prompt.h	…
protocol-caps.c	…
protocol-caps.h	protocol-caps.h: add newline at end of file	2021-06-08 10:08:41 +09:00
protocol.c	…
protocol.h	…
prune-packed.c	…
prune-packed.h	…
quote.c	…
quote.h	…
range-diff.c	Merge branch 'ab/pickaxe-pcre2'	2021-07-13 16:52:50 -07:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'ew/mmap-failures'	2021-07-16 17:42:47 -07:00
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'zh/ref-filter-push-remote-fix'	2021-05-20 08:55:00 +09:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'hn/refs-iterator-peel-returns-boolean'	2021-07-16 17:42:49 -07:00
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	…
remote.c	*: fix typos which duplicate a word	2021-06-14 10:16:06 +09:00
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repository.c	promisor-remote: support per-repository config	2021-06-28 09:57:42 -07:00
repository.h	promisor-remote: support per-repository config	2021-06-28 09:57:42 -07:00
rerere.c	dir: introduce readdir_skip_dot_and_dotdot() helper	2021-05-27 14:02:37 +09:00
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	add_pending_object_with_path(): work around "gcc -O3" complaint	2021-06-11 12:45:37 +09:00
revision.h	Merge branch 'jk/bitmap-tree-optim'	2021-07-08 13:15:00 -07:00
run-command.c	Merge branch 'jt/partial-clone-submodule-1'	2021-07-16 17:42:53 -07:00
run-command.h	Merge branch 'jt/partial-clone-submodule-1'	2021-07-16 17:42:53 -07:00
send-pack.c	send-pack.c: move "no refs in common" abort earlier	2021-06-30 14:57:22 -07:00
send-pack.h	…
sequencer.c	…
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
setup.c	Merge branch 'jt/partial-clone-submodule-1'	2021-07-16 17:42:53 -07:00
sh-i18n--envsubst.c	builtins + test helpers: use return instead of exit() in cmd_*	2021-06-09 09:15:58 +09:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shell.c	builtins + test helpers: use return instead of exit() in cmd_*	2021-06-09 09:15:58 +09:00
shortlog.h	…
sideband.c	sideband: don't lose clear-to-eol at packet boundary	2021-06-17 14:11:36 +09:00
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	simple-ipc: correct ifdefs when NO_PTHREADS is defined	2021-05-21 07:55:00 +09:00
sparse-index.c	Merge branch 'ds/sparse-index-protections'	2021-05-21 05:50:38 +09:00
sparse-index.h	…
split-index.c	split-index: use oideq instead of memcmp to compare object_id's	2021-06-15 12:07:56 +09:00
split-index.h	…
stable-qsort.c	…
strbuf.c	.c _init(): define in terms of corresponding *_INIT macro	2021-07-01 12:32:22 -07:00
strbuf.h	comments: avoid using the gender of our users	2021-06-16 11:25:11 +09:00
streaming.c	…
streaming.h	…
string-list.c	string-list.[ch]: add a string_list_init_{nodup,dup}()	2021-07-01 12:32:22 -07:00
string-list.h	string-list.[ch]: add a string_list_init_{nodup,dup}()	2021-07-01 12:32:22 -07:00
strmap.c	.c _init(): define in terms of corresponding *_INIT macro	2021-07-01 12:32:22 -07:00
strmap.h	…
strvec.c	.c _init(): define in terms of corresponding *_INIT macro	2021-07-01 12:32:22 -07:00
strvec.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	…
submodule-config.h	…
submodule.c	run-command: refactor subprocess env preparation	2021-06-28 09:58:01 -07:00
submodule.h	…
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	…
trace2.h	…
trailer.c	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	Merge branch 'ab/struct-init'	2021-07-16 17:42:53 -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 'mt/parallel-checkout-part-3'	2021-05-16 21:05:23 +09:00
unpack-trees.h	…
upload-pack.c	Merge branch 'jt/push-negotiation'	2021-05-16 21:05:22 +09:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	userdiff: add support for C# record types	2021-06-16 17:06:20 +09: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	dir: introduce readdir_skip_dot_and_dotdot() helper	2021-05-27 14:02:37 +09:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	fsync(): be prepared to see EINTR	2021-06-05 22:13:40 +09:00
ws.c	…
wt-status.c	Merge branch 'ds/gender-neutral-doc'	2021-07-16 17:42:53 -07:00
wt-status.h	…
xdiff-interface.c	Merge branch 'ab/pickaxe-pcre2'	2021-07-13 16:52:50 -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). 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