A fork of Git containing Microsoft-specific patches.

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

Jean-Noël Avila 246cac8505 i18n: turn even more messages into "cannot be used together" ones Even if some of these messages are not subject to gettext i18n, this helps bring a single style of message for a given error type. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2022-01-05 13:31:00 -08:00
.github	Merge branch 'ab/ci-updates'	2021-12-15 09:39:49 -08:00
Documentation	The fifth batch	2021-12-22 22:48:11 -08:00
block-sha1	…
builtin	i18n: turn even more messages into "cannot be used together" ones	2022-01-05 13:31:00 -08:00
ci	Merge branch 'ab/ci-updates'	2021-12-15 09:39:49 -08:00
compat	Merge branch 'hn/reftable'	2021-12-15 09:39:45 -08:00
contrib	Merge branch 'js/scalar'	2021-12-21 15:03:17 -08:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
negotiator	…
perl	…
po	l10n: pl: 2.34.0 round 3	2021-11-14 15:19:23 +01:00
ppc	…
refs	Merge branch 'hn/allow-bogus-oid-in-ref-tests'	2021-12-15 09:39:54 -08:00
reftable	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	i18n: turn even more messages into "cannot be used together" ones	2022-01-05 13:31:00 -08:00
templates	…
trace2	Merge branch 'ab/run-command'	2021-12-15 09:39:47 -08:00
xdiff	Merge branch 'pw/xdiff-classify-record-in-histogram'	2021-12-21 15:03:14 -08:00
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.34.1	2021-11-24 10:55:13 -08:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'js/scalar'	2021-12-21 15:03:17 -08:00
README.md	CI: use shorter names that fit in UX tooltips	2021-11-23 16:51:53 -08:00
RelNotes	Git 2.34.1	2021-11-24 10:55:13 -08:00
SECURITY.md	…
abspath.c	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	run-command API users: use strvec_pushv(), not argv assignment	2021-11-25 22:15:07 -08:00
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	i18n: factorize "--foo outside a repository"	2022-01-05 13:31:00 -08:00
apply.h	git-apply: add --allow-empty flag	2021-12-13 14:30:25 -08:00
archive-tar.c	run-command API users: use strvec_push(), not argv construction	2021-11-25 22:15:07 -08:00
archive-zip.c	…
archive.c	i18n: factorize "--foo requires --bar" and the like	2022-01-05 13:31:00 -08:00
archive.h	…
attr.c	…
attr.h	…
banned.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	branch: protect branches checked out in all worktrees	2021-12-01 22:18:25 -08:00
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	Merge branch 'vd/sparse-reset'	2021-12-10 14:35:12 -08:00
cache-tree.h	…
cache.h	Merge branch 'ew/test-wo-fsync'	2021-12-15 09:39:52 -08: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	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	generate-cmdlist.sh: replace "grep' invocation with a shell version	2021-11-05 12:01:13 -07:00
commit-graph.c	commit-graph: return if there is no git directory	2021-12-06 09:55:05 -08:00
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	ssh signing: make verify-commit consider key lifetime	2021-12-09 13:38:04 -08:00
commit.h	…
common-main.c	common-main.c: call exit(), don't return	2021-12-07 12:29:57 -08:00
config.c	…
config.h	…
config.mak.dev	config.mak.dev: specify -std=gnu99 for gcc/clang	2021-12-08 13:16:44 -08:00
config.mak.in	…
config.mak.uname	Merge branch 'hn/reftable'	2021-12-15 09:39:45 -08:00
configure.ac	Merge branch 'hn/reftable'	2021-12-15 09:39:45 -08:00
connect.c	…
connect.h	…
connected.c	run-command API: remove "env" member, always use "env_array"	2021-11-25 22:15:08 -08:00
connected.h	…
convert.c	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
convert.h	…
copy.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	run-command API users: use strvec_push(), not argv construction	2021-11-25 22:15:07 -08:00
date.c	strbuf_addftime(): handle "%s" manually	2021-11-04 12:38:09 -07:00
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	…
diff-delta.c	…
diff-lib.c	…
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	i18n: turn even more messages into "cannot be used together" ones	2022-01-05 13:31:00 -08:00
diff.h	…
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	…
diffcore-rotate.c	…
diffcore.h	…
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	…
editor.c	run-command API: remove "env" member, always use "env_array"	2021-11-25 22:15:08 -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 'ew/test-wo-fsync'	2021-12-15 09:39:52 -08:00
environment.h	…
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	i18n: factorize "--foo requires --bar" and the like	2022-01-05 13:31:00 -08:00
fetch-pack.h	…
fmt-merge-msg.c	ssh signing: make fmt-merge-msg consider key lifetime	2021-12-09 13:38:04 -08: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-cmdlist.sh: don't parse command-list.txt thrice	2021-11-05 12:01:13 -07:00
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/mingw-gmtime-r'	2021-12-10 14:35:15 -08: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	Merge branch 'ab/sh-retire-helper-functions'	2021-11-29 15:41:50 -08:00
git-submodule.sh	…
git-svn.perl	…
git-web--browse.sh	…
git.c	i18n: factorize "no directory given for --foo"	2022-01-05 13:31:00 -08:00
git.rc	…
gpg-interface.c	Merge branch 'fs/ssh-signing-other-keytypes'	2021-12-21 15:03:16 -08:00
gpg-interface.h	ssh signing: make verify-commit consider key lifetime	2021-12-09 13:38:04 -08: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	…
hash-lookup.c	…
hash-lookup.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
hook.c	…
hook.h	…
http-backend.c	run-command API users: use strvec_pushv(), not argv assignment	2021-11-25 22:15:07 -08:00
http-fetch.c	i18n: factorize "--foo requires --bar" and the like	2022-01-05 13:31:00 -08:00
http-push.c	…
http-walker.c	…
http.c	run-command API users: use strvec_pushv(), not argv assignment	2021-11-25 22:15:07 -08:00
http.h	…
ident.c	…
imap-send.c	…
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	…
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	…
list-objects-filter-options.h	…
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	…
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	ssh signing: make git log verify key lifetime	2021-12-09 13:38:04 -08:00
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-ort-wrappers.c	…
merge-ort-wrappers.h	…
merge-ort.c	…
merge-ort.h	…
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
mergesort.c	mergesort: avoid left shift overflow	2021-11-18 12:42:06 -08:00
mergesort.h	…
midx.c	Merge branch 'tb/plug-pack-bitmap-leaks'	2021-11-29 15:41:49 -08:00
midx.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-file.c	Merge branch 'ab/run-command'	2021-12-15 09:39:47 -08:00
object-name.c	…
object-store.h	…
object.c	object.c: use BUG(...) no die("BUG: ...") in lookup_object_by_type()	2021-12-07 12:33:58 -08:00
object.h	…
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
oidtree.c	…
oidtree.h	…
pack-bitmap-write.c	…
pack-bitmap.c	Merge branch 'jk/test-bitmap-fix'	2021-12-10 14:35:08 -08:00
pack-bitmap.h	…
pack-check.c	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	Merge branch 'tb/pack-revindex-on-disk-cleanup'	2021-12-15 09:39:50 -08:00
packfile.h	Merge branch 'tb/pack-revindex-on-disk-cleanup'	2021-12-15 09:39:50 -08:00
pager.c	pager: fix crash when pager program doesn't exist	2021-11-24 16:14:10 -08:00
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-12-15 09:39:54 -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	…
path.h	…
pathspec.c	…
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	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
promisor-remote.c	…
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	i18n: refactor "foo and bar are mutually exclusive"	2022-01-05 13:29:23 -08:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'vd/sparse-reset'	2021-12-10 14:35:12 -08:00
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"	2022-01-05 13:31:00 -08:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'hn/allow-bogus-oid-in-ref-tests'	2021-12-15 09:39:54 -08:00
refs.h	Merge branch 'hn/allow-bogus-oid-in-ref-tests'	2021-12-15 09:39:54 -08:00
refspec.c	…
refspec.h	…
remote-curl.c	run-command API users: use strvec_pushv(), not argv assignment	2021-11-25 22:15:07 -08:00
remote.c	Merge branch 'gc/remote-with-fewer-static-global-variables'	2021-12-10 14:35:02 -08:00
remote.h	remote: die if branch is not found in repository	2021-11-18 22:31:19 -08:00
replace-object.c	…
replace-object.h	…
repo-settings.c	repo-settings: prepare_repo_settings only in git repos	2021-12-06 09:55:06 -08:00
repository.c	remote: move static variables into per-repository struct	2021-11-18 22:31:19 -08:00
repository.h	remote: move static variables into per-repository struct	2021-11-18 22:31:19 -08:00
rerere.c	…
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	i18n: factorize "--foo requires --bar" and the like	2022-01-05 13:31:00 -08:00
revision.h	…
run-command.c	Merge branch 'ab/run-command'	2021-12-15 09:39:47 -08:00
run-command.h	run-command API: remove "env" member, always use "env_array"	2021-11-25 22:15:08 -08:00
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'en/rebase-x-wo-git-dir-env'	2021-12-21 15:03:15 -08:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	…
sparse-index.c	sparse-index: add ensure_correct_sparsity function	2021-11-24 16:32:38 -08:00
sparse-index.h	sparse-index: add ensure_correct_sparsity function	2021-11-24 16:32:38 -08:00
split-index.c	…
split-index.h	…
stable-qsort.c	…
strbuf.c	strbuf_addftime(): handle "%s" manually	2021-11-04 12:38:09 -07: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	…
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	…
submodule-config.h	…
submodule.c	…
submodule.h	…
symlinks.c	…
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.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	…
tmp-objdir.h	…
trace.c	…
trace.h	…
trace2.c	…
trace2.h	…
trailer.c	run-command API: remove "env" member, always use "env_array"	2021-11-25 22:15:08 -08:00
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	run-command API users: use strvec_push(), not argv construction	2021-11-25 22:15:07 -08:00
transport.h	…
tree-diff.c	pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)	2021-12-07 12:31:17 -08:00
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 'ds/sparse-deep-pattern-checkout-fix'	2021-12-15 09:39:50 -08:00
unpack-trees.h	…
upload-pack.c	run-command API users: use strvec_pushl(), not argv construction	2021-11-25 22:15:07 -08:00
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.c	…
version.h	…
versioncmp.c	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	worktree: simplify find_shared_symref() memory ownership model	2021-12-01 22:18:25 -08:00
worktree.h	worktree: simplify find_shared_symref() memory ownership model	2021-12-01 22:18:25 -08:00
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	Merge branch 'ew/test-wo-fsync'	2021-12-15 09:39:52 -08:00
ws.c	…
wt-status.c	…
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