A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Derrick Stolee fe73a588a0
Merge pull request #301: Update 'git maintenance' to match upstream
This PR updates our `vfs-2.29.0` branch's version of `git maintenance` to match the latest in upstream. Unfortunately, not all of these commits made it to the `2.30` release candidate, but there are more commits from the series making it in. They will cause a conflict in the `vfs-2.30.0` rebase, so merge them in here. This also includes the `fixup!` reverts of the earlier versions.

Finally, I also noticed that we started depending on `git maintenance start` in Scalar for macOS, but we never checked that this worked with the shared object cache. It doesn't! 😨  The very tip commit of this PR includes logic to make `git maintenance run` care about `gvfs.sharedCache`. Functional test updates in Scalar will follow.
2020-12-15 08:59:18 -05:00
.github Merge pull request #300 from dscho/vs-build-and-libiconv 2020-12-04 18:53:23 +01:00
Documentation Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05:00
block-sha1
builtin maintenance: care about gvfs.sharedCache config 2020-12-14 23:05:13 -05:00
ci ci: do not skip tagged revisions in GitHub workflows 2020-10-08 11:58:41 -07:00
compat Merge pull request #300 from dscho/vs-build-and-libiconv 2020-12-04 18:53:23 +01:00
contrib Merge pull request #300 from dscho/vs-build-and-libiconv 2020-12-04 18:53:23 +01:00
ewah
git-gui Merge branch 'gitk-and-git-gui-patches' 2020-10-19 21:12:26 +02:00
gitk-git Merge branch 'gitk-and-git-gui-patches' 2020-10-19 21:12:26 +02:00
gitweb
mergetools Merge pull request #298 from dscho/fix-beyond-compare 2020-11-12 22:32:59 +01:00
negotiator
perl
po Merge branch 'master' of github.com:Softcatala/git-po 2020-10-18 09:56:33 +08:00
ppc
refs Introduce helper to create symlinks that knows about index_state 2020-10-19 21:12:22 +02:00
sha1collisiondetection@855827c583
sha1dc
sha256
t Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05:00
templates
trace2 trace2:gvfs:experiment: increase default event depth for unpack-tree data 2020-10-19 15:27:03 -04:00
vcs-svn
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes gitattributes: mark .png files as binary 2020-10-19 21:12:23 +02:00
.gitignore Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05:00
.gitmodules
.mailmap
.travis.yml
.tsan-suppressions
BRANCHES.md BRANCHES.md: Add explanation of branches and using forks 2020-10-19 15:24:07 -04:00
CODE_OF_CONDUCT.md Modify the Code of Conduct for Git for Windows 2020-10-19 21:12:25 +02:00
CONTRIBUTING.md CONTRIBUTING.md: add guide for first-time contributors 2020-10-19 21:12:25 +02:00
COPYING
GIT-VERSION-GEN gvfs: ensure that the version is based on a GVFS tag 2020-10-19 15:22:16 -04:00
INSTALL
LGPL-2.1
Makefile Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05:00
README.md README.md: Add a Windows-specific preamble 2020-10-19 21:12:25 +02:00
RelNotes
SECURITY.md SECURITY.md: document Git for Windows' policies 2020-10-19 21:12:25 +02:00
abspath.c strbuf_realpath(): use platform-dependent API if available 2020-10-19 21:09:12 +02:00
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 sparse-checkout: avoid writing entries with the skip-worktree bit 2020-10-19 15:23:50 -04:00
apply.h
archive-tar.c archive: avoid spawning `gzip` 2020-10-19 21:09:11 +02:00
archive-zip.c
archive.c
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.h
builtin.h Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c trace2:gvfs:experiment: add region to cache_tree_fully_valid() 2020-10-19 15:26:56 -04:00
cache-tree.h
cache.h sha1-file: create shared-cache directory if it doesn't exist 2020-10-19 15:27:59 -04:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check_bindir
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt fixup! for-each-repo: run subcommands on configured repos 2020-12-14 21:04:57 -05:00
commit-graph.c
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c
commit.h
common-main.c
config.c sha1-file: create shared-cache directory if it doesn't exist 2020-10-19 15:27:59 -04:00
config.h Add virtual file system settings and hook proc 2020-10-19 15:24:24 -04:00
config.mak.dev
config.mak.in
config.mak.uname mingw: add a Makefile target to copy test artifacts 2020-10-19 21:12:24 +02:00
configure.ac
connect.c
connect.h
connected.c gvfs: allow "virtualizing" objects 2020-10-19 15:22:58 -04:00
connected.h
convert.c gvfs: ensure all filters and EOL conversions are blocked 2020-10-19 15:22:47 -04:00
convert.h
copy.c
credential.c credential: set trace2_child_class for credential manager children 2020-10-19 15:27:16 -04:00
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diffcore-rename: speed up register_rename_src 2020-10-19 21:09:11 +02:00
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Add virtual file system settings and hook proc 2020-10-19 15:24:24 -04:00
dir.h
editor.c
entry.c Introduce helper to create symlinks that knows about index_state 2020-10-19 21:12:22 +02:00
environment.c sha1-file: create shared-cache directory if it doesn't exist 2020-10-19 15:27:59 -04:00
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c fscache: fscache takes an initial size 2020-10-19 21:12:07 +02:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor.c fsmonitor: check CE_FSMONITOR_VALID in ce_uptodate 2020-10-19 15:25:45 -04:00
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 Allow `add -p` and `add -i` with a large number of files 2020-10-19 21:09:13 +02:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Introduce helper to create symlinks that knows about index_state 2020-10-19 21:12:22 +02:00
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 mergetool: avoid letting `list_tool_variants` break user-defined setups 2020-11-11 16:12:27 +01:00
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--preserve-merges.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh mingw: only use Bash-ism `builtin pwd -W` when available 2020-10-19 21:12:23 +02:00
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05:00
git.rc
gpg-interface.c Unbreak interactive GPG prompt upon signing 2020-10-19 21:12:20 +02:00
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
gvfs-helper-client.c gvfs-helper: add prefetch support 2020-10-19 15:28:37 -04:00
gvfs-helper-client.h gvfs-helper: add prefetch support 2020-10-19 15:28:37 -04:00
gvfs-helper.c gvfs-helper: verify loose objects after write 2020-10-19 15:45:08 -04:00
gvfs.c gvfs: allow overriding core.gvfs 2020-10-19 15:24:05 -04:00
gvfs.h fetch: use gvfs-helper prefetch under config 2020-10-19 15:28:45 -04:00
hash.h
hashmap.c
hashmap.h
help.c vfs: disable `git update-git-for-windows` 2020-10-19 15:24:09 -04:00
help.h help: do not expect built-in commands to be hardlinked 2020-10-07 15:25:10 -07:00
hex.c
http-backend.c mingw: ensure that core.longPaths is handled *always* 2020-10-19 21:12:20 +02:00
http-fetch.c
http-push.c
http-walker.c
http.c http: use new "best effort" strategy for Secure Channel revoke checking 2020-10-19 21:09:13 +02: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.c: use is_dir_sep() instead of hardcoded '/' checks 2020-10-19 21:12:21 +02:00
lockfile.h
log-tree.c
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: add GIT_TRACE_MEMPOOL support 2020-10-19 21:12:07 +02:00
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-recursive.c merge-recursive: teach was_dirty() about the virtualfilesystem 2020-10-19 15:25:39 -04:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05: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-store.h sha1-file: add function to update existing loose object cache 2020-10-19 15:27:22 -04:00
object.c
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c
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 packfile: add install_packed_git_and_mru() 2020-10-19 15:27:32 -04:00
packfile.h packfile: add install_packed_git_and_mru() 2020-10-19 15:27:32 -04:00
pager.c
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'dont-clean-junctions' 2020-10-19 21:09:20 +02:00
path.h
pathspec.c
pathspec.h
pkt-line.c status: add status serialization mechanism 2020-10-19 15:25:11 -04:00
pkt-line.h status: add status serialization mechanism 2020-10-19 15:25:11 -04:00
preload-index.c fscache: update fscache to be thread specific instead of global 2020-10-19 21:12:07 +02:00
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c gvfs-helper: create tool to fetch objects using the GVFS Protocol 2020-10-19 15:27:39 -04:00
promisor-remote.h
prompt.c git add -i: handle CR/LF line endings in the interactive input 2020-10-19 21:09:13 +02:00
prompt.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c
reachable.h
read-cache.c trace2:gvfs:experiment: read-cache: time read/write of cache-tree extension 2020-10-19 15:26:48 -04:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c mingw: ensure that core.longPaths is handled *always* 2020-10-19 21:12:20 +02:00
refs.h
refspec.c
refspec.h
remote-curl.c remote-curl: do not call fetch-pack when using gvfs-helper 2020-10-19 15:28:50 -04:00
remote.c Trace2:gvfs:experiment: capture more 'tracking' details 2020-10-19 15:27:07 -04:00
remote.h
replace-object.c
replace-object.h
repo-settings.c Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05:00
repository.c
repository.h Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05:00
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c Merge current ds/maintenance-part-4 into vfs-2.29.0 2020-12-14 21:06:08 -05:00
run-command.h Add a new run_hook_strvec() function 2020-10-19 15:22:50 -04:00
send-pack.c send-pack: do not check for sha1 file when GVFS_MISSING_OK set 2020-10-19 15:23:59 -04:00
send-pack.h
sequencer.c
sequencer.h
serve.c
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-file.c sha1-file: create shared-cache directory if it doesn't exist 2020-10-19 15:27:59 -04:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c
sha1dc_git.c
sha1dc_git.h
shallow.c
shallow.h
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
stable-qsort.c
strbuf.c strbuf_readlink: support link targets that exceed PATH_MAX 2020-10-19 21:12:20 +02:00
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
strvec.c
strvec.h
sub-process.c sub-process: add subprocess_start_argv() 2020-10-19 15:27:19 -04:00
sub-process.h sub-process: add subprocess_start_argv() 2020-10-19 15:27:19 -04:00
submodule-config.c
submodule-config.h
submodule.c
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 Always auto-gc after calling a fast-import transport 2020-10-19 21:09:10 +02:00
transport-internal.h
transport.c
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
unpack-trees.c trace2:gvfs:experiment: add data for check_updates() in unpack_trees() 2020-10-19 15:27:05 -04:00
unpack-trees.h
upload-pack.c upload-pack: fix race condition in error messages 2020-10-19 15:29:24 -04: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
virtualfilesystem.c trace2:gvfs:experiment: add region to apply_virtualfilesystem() 2020-10-19 15:26:52 -04:00
virtualfilesystem.h Add virtual file system settings and hook proc 2020-10-19 15:24:24 -04:00
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status-deserialize.c gvfs:trace2:data: status deserialization information 2020-10-19 15:26:31 -04:00
wt-status-serialize.c gvfs:trace2:data: status serialization 2020-10-19 15:26:35 -04:00
wt-status.c status: serialize to path 2020-10-19 15:25:18 -04:00
wt-status.h gvfs:trace2:data: status deserialization information 2020-10-19 15:26:31 -04:00
xdiff-interface.c
xdiff-interface.h
zlib.c

README.md

Git for Windows

Build status Join the chat at https://gitter.im/git-for-windows/git

This is Git for Windows, the Windows port of Git.

The Git for Windows project is run using a governance model. If you encounter problems, you can report them as GitHub issues, discuss them on Git for Windows' Google Group, and contribute bug fixes.

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 core 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. The core git mailing list is plain text (no HTML!).

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