Go to file

Junio C Hamano df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' The diff-* plumbing family of subcommands now pay attention to the diff.wsErrorHighlight configuration, which has been ignored before; this allows "git add -p" to also show the whitespace problems to the end user. * jk/diff-honor-wserrhighlight-in-plumbing: diff: move diff.wsErrorHighlight to "basic" config		2020-02-14 12:54:22 -08:00
.github	…
Documentation	Merge branch 'ds/sparse-checkout-harden'	2020-02-14 12:54:22 -08:00
block-sha1	…
builtin	Merge branch 'ds/sparse-checkout-harden'	2020-02-14 12:54:22 -08:00
ci	Merge branch 'js/ci-squelch-doc-warning'	2020-02-12 12:41:39 -08:00
compat	Merge branch 'jk/clang-sanitizer-fixes'	2020-02-12 12:41:36 -08:00
contrib	Merge branch 'mt/sparse-checkout-doc-update'	2020-02-05 14:35:00 -08:00
ewah	ewah/bitmap: introduce bitmap_word_alloc()	2020-01-23 10:51:50 -08:00
git-gui	Merge https://github.com/prati0100/git-gui	2020-01-08 11:18:06 -08:00
gitk-git	…
gitweb	Merge branch 'do/gitweb-typofix-in-comments'	2020-01-08 12:44:11 -08:00
mergetools	…
negotiator	…
perl	…
po	l10n: zh_CN: for git v2.25.0 l10n round 1	2020-01-12 19:22:02 +08:00
ppc	…
refs	C: use skip_prefix() to avoid hardcoded string length	2020-01-31 13:03:45 -08:00
sha1collisiondetection@855827c583	…
sha1dc	Merge branch 'jk/lore-is-the-archive'	2019-12-06 15:09:23 -08:00
sha256	…
t	Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'	2020-02-14 12:54:22 -08:00
templates	Merge branch 'kw/fsmonitor-watchman-racefix'	2020-02-14 12:54:20 -08:00
trace2	Merge branch 'en/doc-typofix'	2019-12-01 09:04:35 -08:00
vcs-svn	…
xdiff	Merge branch 'rs/xdiff-ignore-ws-w-func-context'	2019-12-16 13:08:32 -08:00
.cirrus.yml	CI: add FreeBSD CI support via Cirrus-CI	2019-12-20 12:09:12 -08:00
.clang-format	…
.editorconfig	editorconfig: indent text files with tabs	2020-01-06 08:46:32 -08:00
.gitattributes	…
.gitignore	sparse-checkout: create builtin with 'list' subcommand	2019-11-22 16:11:43 +09:00
.gitmodules	…
.mailmap	Sync with maint	2020-01-30 14:17:17 -08:00
.travis.yml	…
.tsan-suppressions	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	The first batch post 2.25 cycle	2020-01-22 15:08:43 -08:00
INSTALL	Merge branch 'ar/install-doc-update-cmds-needing-the-shell'	2019-12-01 09:04:41 -08:00
LGPL-2.1	…
Makefile	Merge branch 'jk/asan-build-fix'	2020-01-30 14:17:09 -08:00
README.md	doc: recommend lore.kernel.org over public-inbox.org	2019-11-30 09:12:04 -08:00
RelNotes	The first batch post 2.25 cycle	2020-01-22 15:08:43 -08:00
abspath.c	…
aclocal.m4	…
add-interactive.c	Merge branch 'js/add-p-leftover-bits'	2020-02-05 14:34:58 -08:00
add-interactive.h	built-in add -p: respect the `interactive.singlekey` config setting	2020-01-15 12:06:17 -08:00
add-patch.c	built-in add -p: respect the `interactive.singlekey` config setting	2020-01-15 12:06:17 -08:00
advice.c	add: change advice config variables used by the add API	2020-02-06 11:08:00 -08:00
advice.h	add: change advice config variables used by the add API	2020-02-06 11:08:00 -08:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'js/add-i-a-bit-more-tests'	2019-12-16 13:08:47 -08:00
apply.h	…
archive-tar.c	…
archive-zip.c	Merge branch 'rs/archive-zip-code-cleanup'	2019-12-16 13:14:47 -08:00
archive.c	…
archive.h	…
argv-array.c	argv-array: add space after `while`	2019-11-20 13:29:02 +09:00
argv-array.h	argv-array: move doc to argv-array.h	2019-11-18 15:21:29 +09:00
attr.c	attr: move doc to attr.h	2019-11-18 15:21:28 +09:00
attr.h	attr: move doc to attr.h	2019-11-18 15:21:28 +09:00
azure-pipelines.yml	…
banned.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	sparse-checkout: create builtin with 'list' subcommand	2019-11-22 16:11:43 +09:00
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	fsmonitor: change last update timestamp on the index_state to opaque token	2020-01-13 14:58:43 -08: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	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
commit-graph.c	Merge branch 'ds/commit-graph-set-size-mult'	2020-01-06 14:17:51 -08:00
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	gpg-interface: add minTrustLevel as a configuration option	2020-01-15 14:06:06 -08:00
commit.h	gpg-interface: add minTrustLevel as a configuration option	2020-01-15 14:06:06 -08:00
common-main.c	…
config.c	sparse-checkout: add 'cone' mode	2019-11-22 16:11:44 +09:00
config.h	…
config.mak.dev	…
config.mak.in	…
config.mak.uname	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
configure.ac	Merge branch 'dd/sequencer-utf8'	2019-12-01 09:04:36 -08:00
connect.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
connect.h	…
connected.c	connected: verify promisor-ness of partial clone	2020-01-30 10:55:31 -08:00
connected.h	connected: verify promisor-ness of partial clone	2020-01-30 10:55:31 -08:00
convert.c	Merge branch 'js/convert-typofix'	2020-02-12 12:41:39 -08:00
convert.h	…
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	credential: move doc to credential.h	2019-11-18 15:21:29 +09:00
csum-file.c	…
csum-file.h	csum-file: introduce hashfile_total()	2020-01-23 10:51:50 -08:00
ctype.c	…
daemon.c	…
date.c	date.c: switch to reentrant {gm,local}time_r	2019-11-30 13:50:48 -08:00
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: move diff.wsErrorHighlight to "basic" config	2020-01-31 12:01:19 -08:00
diff.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'ds/sparse-checkout-harden'	2020-02-14 12:54:22 -08:00
dir.h	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
editor.c	…
entry.c	…
environment.c	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
exec-cmd.c	…
exec-cmd.h	…
fast-import.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	Merge branch 'ec/fetch-mark-common-refs-trace2'	2019-12-05 12:52:44 -08:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
fsck.h	…
fsmonitor.c	fsmonitor: handle version 2 of the hooks that will use opaque token	2020-01-13 14:58:43 -08:00
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	git add -p: use non-zero exit code when the diff generation failed	2019-12-06 08:57:34 -08:00
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-legacy-stash.sh	Merge branch 'js/patch-mode-in-others-in-c'	2020-02-05 14:34:58 -08: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-p4: avoid leak of file handle when cloning	2020-01-30 12:21:13 -08:00
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	…
git-submodule.sh	submodule add: show 'add --dry-run' stderr when aborting	2020-01-15 10:22:24 -08:00
git-svn.perl	git svn: stop using `rebase --preserve-merges`	2019-11-23 09:49:23 +09:00
git-web--browse.sh	…
git.c	sparse-checkout: create builtin with 'list' subcommand	2019-11-22 16:11:43 +09:00
git.rc	…
gpg-interface.c	Merge branch 'hi/gpg-mintrustlevel'	2020-01-30 14:17:08 -08:00
gpg-interface.h	Merge branch 'hi/gpg-mintrustlevel'	2020-01-30 14:17:08 -08:00
graph.c	graph: fix collapse of multiple edges	2020-01-15 12:14:51 -08:00
graph.h	…
grep.c	grep: replace grep_read_mutex by internal obj read lock	2020-01-17 13:52:14 -08:00
grep.h	grep: replace grep_read_mutex by internal obj read lock	2020-01-17 13:52:14 -08:00
hash.h	…
hashmap.c	…
hashmap.h	Merge branch 'en/doc-typofix'	2019-12-01 09:04:35 -08:00
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	Merge branch 'cb/curl-use-xmalloc'	2019-12-01 09:04:33 -08:00
http.h	…
ident.c	…
imap-send.c	…
interdiff.c	…
interdiff.h	…
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	Merge branch 'hi/gpg-use-check-signature'	2019-12-10 13:11:45 -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-recursive.c	merge-recursive: use subtraction to flip stage	2020-01-27 11:17:41 -08:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	…
midx.h	…
name-hash.c	Merge branch 'en/doc-typofix'	2019-12-01 09:04:35 -08:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	C: use skip_prefix() to avoid hardcoded string length	2020-01-31 13:03:45 -08:00
notes.h	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
object-store.h	Merge branch 'mt/threaded-grep-in-object-store'	2020-02-14 12:54:20 -08:00
object.c	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
object.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	…
pack-bitmap.c	Merge branch 'jk/packfile-reuse-cleanup'	2020-02-14 12:54:19 -08:00
pack-bitmap.h	Merge branch 'jk/packfile-reuse-cleanup'	2020-02-14 12:54:19 -08:00
pack-check.c	…
pack-objects.c	Merge branch 'jk/optim-in-pack-idx-conversion'	2019-12-01 09:04:38 -08:00
pack-objects.h	Merge branch 'jk/optim-in-pack-idx-conversion'	2019-12-01 09:04:38 -08:00
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	Merge branch 'mt/threaded-grep-in-object-store'	2020-02-14 12:54:20 -08:00
packfile.h	Merge branch 'jk/packfile-reuse-cleanup'	2020-02-14 12:54:19 -08:00
pager.c	…
parse-options-cb.c	…
parse-options.c	Merge branch 'jb/parse-options-message-fix'	2020-02-12 12:41:37 -08:00
parse-options.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
path.h	…
pathspec.c	pathspec: add new function to parse file	2019-11-20 13:01:53 +09:00
pathspec.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
pkt-line.c	…
pkt-line.h	pkt-line: fix a typo	2019-12-02 08:48:56 -08:00
preload-index.c	…
pretty.c	Merge branch 'hi/gpg-mintrustlevel'	2020-01-30 14:17:08 -08:00
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	progress: create GIT_PROGRESS_DELAY	2019-11-27 10:57:10 +09:00
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol.c	fetch: default to protocol version 2	2020-01-15 14:03:55 -08:00
protocol.h	…
quote.c	…
quote.h	…
range-diff.c	range-diff: mark pointers as const	2019-12-06 12:34:49 -08:00
range-diff.h	Merge branch 'dl/range-diff-with-notes'	2019-12-16 13:08:46 -08:00
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'	2020-01-10 14:45:27 -08:00
rebase-interactive.c	rebase-interactive: warn if commit is dropped with `rebase --edit-todo'	2020-01-28 14:14:57 -08:00
rebase-interactive.h	rebase-interactive: warn if commit is dropped with `rebase --edit-todo'	2020-01-28 14:14:57 -08:00
ref-filter.c	…
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	refs: move doc to refs.h	2019-11-18 15:21:28 +09:00
refspec.c	…
refspec.h	remote: move doc to remote.h and refspec.h	2019-11-18 15:21:28 +09:00
remote-curl.c	C: use skip_prefix() to avoid hardcoded string length	2020-01-31 13:03:45 -08:00
remote-testsvn.c	…
remote.c	…
remote.h	remote: move doc to remote.h and refspec.h	2019-11-18 15:21:28 +09:00
replace-object.c	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
replace-object.h	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
repo-settings.c	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
revision.h	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
run-command.c	Merge branch 'bc/run-command-nullness-after-free-fix'	2020-01-22 15:07:31 -08:00
run-command.h	run-command: move doc to run-command.h	2019-11-18 15:21:29 +09:00
send-pack.c	Merge branch 'jk/send-pack-check-negative-with-quick'	2019-12-06 15:09:22 -08:00
send-pack.h	…
sequencer.c	Merge branch 'ag/edit-todo-drop-check'	2020-02-14 12:54:21 -08:00
sequencer.h	Merge branch 'ag/edit-todo-drop-check'	2020-02-14 12:54:21 -08:00
serve.c	…
serve.h	…
server-info.c	…
setup.c	verify_filename(): handle backslashes in "wildcards are pathspecs" rule	2020-01-27 10:46:35 -08:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-file.c	Merge branch 'mt/threaded-grep-in-object-store'	2020-02-14 12:54:20 -08:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	Merge branch 'jk/get-oid-error-message-i18n'	2020-02-14 12:54:21 -08:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shell.c	shell: use skip_prefix() instead of starts_with()	2019-11-27 11:18:24 +09:00
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	sigchain: move doc to sigchain.h	2019-11-18 15:21:29 +09:00
split-index.c	…
split-index.h	…
stable-qsort.c	…
strbuf.c	strbuf: add a helper function to call the editor "on an strbuf"	2019-12-13 12:37:14 -08:00
strbuf.h	strbuf: add a helper function to call the editor "on an strbuf"	2019-12-13 12:37:14 -08:00
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	Merge branch 'en/string-list-can-be-custom-sorted'	2020-01-22 15:07:31 -08:00
sub-process.c	…
sub-process.h	…
submodule-config.c	submodule-config: add skip_if_read option to repo_read_gitmodules()	2020-01-17 13:52:14 -08:00
submodule-config.h	submodule-config: add skip_if_read option to repo_read_gitmodules()	2020-01-17 13:52:14 -08:00
submodule.c	Merge branch 'es/submodule-fetch-message-fix'	2020-02-12 12:41:38 -08:00
submodule.h	Sync with 2.22.2	2019-12-06 16:31:30 +01: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	trace: move doc to trace.h	2019-11-18 15:21:29 +09:00
trace2.c	…
trace2.h	trace2: move doc to trace2.h	2019-11-18 15:21:29 +09:00
trailer.c	…
trailer.h	…
transport-helper.c	C: use skip_prefix() to avoid hardcoded string length	2020-01-31 13:03:45 -08:00
transport-internal.h	…
transport.c	Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'	2020-01-22 15:07:32 -08:00
transport.h	…
tree-diff.c	…
tree-walk.c	Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'	2020-01-06 14:17:50 -08:00
tree-walk.h	tree-walk: move doc to tree-walk.h	2019-11-18 15:21:29 +09:00
tree.c	…
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'ds/sparse-checkout-harden'	2020-02-14 12:54:22 -08:00
unpack-trees.h	sparse-checkout: update working directory in-process	2019-11-22 16:11:44 +09:00
upload-pack.c	…
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	Merge branch 'ln/userdiff-elixir'	2019-12-25 11:21:59 -08: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	…
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	…
ws.c	…
wt-status.c	…
wt-status.h	…
xdiff-interface.c	xdiff: avoid computing non-zero offset from NULL pointer	2020-01-28 23:13:25 -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