Go to file

Jeff King a38cb9878a mailmap: only look for .mailmap in work tree When trying to find a .mailmap file, we will always look for it in the current directory. This makes sense in a repository with a working tree, since we'd always go to the toplevel directory at startup. But for a bare repository, it can be confusing. With an option like --git-dir (or $GIT_DIR in the environment), we don't chdir at all, and we'd read .mailmap from whatever directory you happened to be in before starting Git. (Note that --git-dir without specifying a working tree historically means "the current directory is the root of the working tree", but most bare repositories will have core.bare set these days, meaning they will realize there is no working tree at all). The documentation for gitmailmap(5) says: If the file `.mailmap` exists at the toplevel of the repository[...] which likewise reinforces the notion that we are looking in the working tree. This patch prevents us from looking for such a file when we're in a bare repository. This does break something that used to work: cd bare.git git cat-file blob HEAD:.mailmap >.mailmap git shortlog But that was never advertised in the documentation. And these days we have mailmap.blob (which defaults to HEAD:.mailmap) to do the same thing in a much cleaner way. However, there's one more interesting case: we might not have a repository at all! The git-shortlog command can be run with git-log output fed on its stdin, and it will apply the mailmap. In that case, it probably does make sense to read .mailmap from the current directory. This patch will continue to do so. That leads to one even weirder case: if you run git-shortlog to process stdin, the input _could_ be from a different repository entirely. Should we respect the in-tree .mailmap then? Probably yes. Whatever the source of the input, if shortlog is running in a repository, the documentation claims that we'd read the .mailmap from its top-level (and of course it's reasonably likely that it _is_ from the same repo, and the user just preferred to run git-log and git-shortlog separately for whatever reason). The included test covers these cases, and we now document the "no repo" case explicitly. We also add a test that confirms we find a top-level ".mailmap" even when we start in a subdirectory of the working tree. This worked both before and after this commit, but we never tested it explicitly (it works because we always chdir to the top-level of the working tree if there is one). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2021-02-10 13:34:51 -08:00
.github	ci: do not cancel all jobs of a matrix if one fails	2021-01-27 22:09:42 -08:00
Documentation	mailmap: only look for .mailmap in work tree	2021-02-10 13:34:51 -08:00
block-sha1	block-sha1: take a size_t length parameter	2020-11-16 13:41:35 -08:00
builtin	Merge branch 'ab/branch-sort' into maint	2021-02-08 14:05:55 -08:00
ci	Merge branch 'js/default-branch-name-tests-final-stretch'	2021-01-25 14:19:18 -08:00
compat	Merge branch 'da/vs-build-iconv-fix'	2020-12-14 10:21:38 -08:00
contrib	completion: add proper public __git_complete	2021-01-04 15:25:56 -08:00
ewah	bitmap: implement bitmap_is_subset()	2020-12-08 14:48:16 -08:00
git-gui	Merge https://github.com/prati0100/git-gui	2020-12-18 15:07:10 -08:00
gitk-git	Merge remote-tracking branch 'paulus/master' into pm/gitk-update	2020-10-03 10:06:27 -07:00
gitweb	gitweb/Makefile: conditionally include ../GIT-VERSION-FILE	2020-12-08 16:56:56 -08:00
mergetools	Merge branch 'pd/mergetool-nvimdiff'	2020-11-21 15:14:39 -08:00
negotiator	negotiator/noop: add noop fetch negotiator	2020-08-18 13:25:05 -07:00
perl	Merge branch 'jk/perl-warning'	2020-11-09 14:06:25 -08:00
po	l10n: zh_CN: for git v2.30.0 l10n round 1 and 2	2020-12-27 19:23:27 +08:00
ppc	…
refs	refs/files-backend: don't peek into `struct lock_file`	2021-01-06 13:53:32 -08:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	mailmap: only look for .mailmap in work tree	2021-02-10 13:34:51 -08:00
templates	hook: add sample template for push-to-checkout	2020-10-16 08:47:02 -07:00
trace2	…
vcs-svn	drop vcs-svn experiment	2020-08-13 11:02:15 -07:00
xdiff	diff: add -I<regex> that ignores matching changes	2020-10-20 12:53:26 -07:00
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	CoC: explicitly take any whitespace breakage	2021-01-04 09:44:49 -08:00
.gitignore	Merge branch 'fc/random-cleanup'	2020-12-08 15:11:21 -08:00
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	CoC: update to version 2.0 + local changes	2021-01-13 17:45:04 -08:00
COPYING	…
GIT-VERSION-GEN	Git 2.30.1	2021-02-08 14:05:55 -08:00
INSTALL	doc: mention Python 3.x supports	2020-12-14 15:01:03 -08:00
LGPL-2.1	…
Makefile	Merge branch 'so/log-diff-merge'	2021-02-05 16:40:44 -08:00
README.md	…
RelNotes	Prepare for 2.30.1	2021-02-05 16:31:28 -08:00
abspath.c	abspath: add a function to resolve paths with missing components	2020-12-12 23:35:47 -08:00
aclocal.m4	…
add-interactive.c	Merge branch 'js/add-i-color-fix'	2020-12-08 15:11:17 -08:00
add-interactive.h	…
add-patch.c	Merge branch 'js/add-i-color-fix'	2020-12-08 15:11:17 -08:00
advice.c	push: parse and set flag for "--force-if-includes"	2020-10-03 09:59:19 -07:00
advice.h	push: parse and set flag for "--force-if-includes"	2020-10-03 09:59:19 -07:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'ab/unreachable-break'	2020-12-18 15:15:18 -08:00
apply.h	…
archive-tar.c	archive: support compression levels beyond 9	2020-11-09 11:25:45 -08:00
archive-zip.c	archive: read short blobs in archive.c::write_archive_entry()	2020-09-19 15:56:05 -07:00
archive.c	Merge branch 'rs/archive-plug-leak-refname'	2020-11-25 15:24:53 -08:00
archive.h	Merge branch 'rs/archive-plug-leak-refname'	2020-11-25 15:24:53 -08:00
attr.c	Use new HASHMAP_INIT macro to simplify hashmap initialization	2020-11-11 12:55:27 -08:00
attr.h	…
banned.h	banned.h: mark ctime_r() and asctime_r() as banned	2020-12-02 14:30:39 -08:00
base85.c	…
bisect.c	hash-lookup: rename from sha1-lookup	2021-01-04 13:01:55 -08:00
bisect.h	bisect: combine args passed to find_bisection()	2020-08-07 15:13:03 -07:00
blame.c	Merge branch 'en/strmap'	2020-11-21 15:14:38 -08:00
blame.h	blame: simplify 'setup_blame_bloom_data' interface	2020-11-01 15:54:15 -08:00
blob.c	…
blob.h	…
bloom.c	Use new HASHMAP_INIT macro to simplify hashmap initialization	2020-11-11 12:55:27 -08:00
bloom.h	bloom: encode out-of-bounds filters as non-empty	2020-09-17 21:55:50 -07:00
branch.c	wt-status: tolerate dangling marks	2020-09-02 14:39:25 -07:00
branch.h	…
builtin.h	Merge branch 'ds/maintenance-part-3'	2020-11-18 13:32:53 -08:00
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	bundle: arguments can be read from stdin	2021-01-11 21:50:41 -08:00
bundle.h	Merge branch 'bc/sha-256-part-3'	2020-08-11 18:04:11 -07:00
cache-tree.c	cache-tree: speed up consecutive path comparisons	2021-01-15 23:05:13 -08:00
cache-tree.h	…
cache.h	Merge branch 'ps/config-env-pairs'	2021-01-25 14:19:19 -08:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	config: drop git_config_get_string_const()	2020-08-17 15:35:47 -07:00
checkout.h	…
color.c	…
color.h	…
column.c	Merge branch 'jk/strvec'	2020-08-10 10:23:57 -07:00
column.h	…
combine-diff.c	Merge branch 'jk/diff-cc-oidfind-fix'	2020-10-05 14:01:55 -07:00
command-list.txt	mailmap doc: create a new "gitmailmap(5)" man page	2021-01-12 14:04:39 -08:00
commit-graph.c	Merge branch 'jk/peel-iterated-oid'	2021-02-03 15:04:49 -08:00
commit-graph.h	Merge branch 'tb/bloom-improvements'	2020-09-29 14:01:20 -07:00
commit-reach.c	commit-reach: fix in_merge_bases_many bug	2020-10-02 10:26:31 -07:00
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'ma/sha1-is-a-hash'	2021-01-15 15:20:29 -08:00
commit.h	Merge branch 'en/merge-ort-recursive'	2021-01-06 23:33:44 -08:00
common-main.c	…
config.c	Merge branch 'ps/config-env-pairs'	2021-01-25 14:19:19 -08:00
config.h	Merge branch 'ps/config-env-pairs'	2021-01-25 14:19:19 -08:00
config.mak.dev	Merge branch 'jc/sparse-error-for-developer-build'	2020-11-18 13:32:54 -08:00
config.mak.in	…
config.mak.uname	Merge branch 'rb/nonstop-config-mak-uname-update'	2020-12-18 15:15:18 -08:00
configure.ac	…
connect.c	Merge branch 'jk/forbid-lf-in-git-url' into maint	2021-02-05 16:31:27 -08:00
connect.h	…
connected.c	Merge branch 'rs/more-buffered-io'	2020-08-24 14:54:31 -07:00
connected.h	…
convert.c	convert: drop unused crlf_action from check_global_conv_flags_eol()	2020-09-30 12:53:47 -07:00
convert.h	…
copy.c	…
credential.c	credential: treat CR/LF as line endings in the credential protocol	2020-10-03 10:41:03 -07:00
credential.h	…
csum-file.c	…
csum-file.h	csum-file: add hashwrite_be64()	2020-11-12 09:40:06 -08:00
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	Merge branch 'rs/plug-diff-cache-leak'	2020-11-25 15:24:53 -08:00
diff-merges.c	diff-merges: add '--diff-merges=1' as synonym for 'first-parent'	2020-12-21 13:47:32 -08:00
diff-merges.h	diff-merges: get rid of now empty diff_merges_init_revs()	2020-12-21 13:47:31 -08:00
diff-no-index.c	…
diff.c	Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'	2021-01-25 14:19:18 -08:00
diff.h	Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'	2021-01-25 14:19:18 -08:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	diffcore-rename: remove unnecessary duplicate entry checks	2021-01-04 12:59:34 -08:00
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'en/strmap'	2020-11-21 15:14:38 -08:00
dir.h	dir: fix problematic API to avoid memory leaks	2020-08-18 17:17:31 -07:00
editor.c	config: fix leaks from git_config_get_string_const()	2020-08-14 10:52:04 -07:00
entry.c	checkout_entry(): remove unreachable error() call	2020-08-18 13:26:10 -07:00
environment.c	config: allow specifying config entries via envvar pairs	2021-01-15 13:03:45 -08:00
environment.h	environment: make `getenv_safe()` a public function	2021-01-15 13:03:45 -08:00
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	negotiator/noop: add noop fetch negotiator	2020-08-18 13:25:05 -07:00
fetch-negotiator.h	…
fetch-pack.c	fetch-pack: refactor writing promisor file	2021-01-12 16:01:07 -08:00
fetch-pack.h	Merge branch 'jt/lazy-fetch'	2020-09-03 12:37:04 -07:00
fmt-merge-msg.c	Merge branch 'so/log-diff-merge'	2021-02-05 16:40:44 -08:00
fmt-merge-msg.h	…
fsck.c	Merge branch 'jk/forbid-lf-in-git-url' into maint	2021-02-05 16:31:27 -08:00
fsck.h	fsck: make fsck_config() re-usable	2021-01-05 14:58:29 -08:00
fsmonitor.c	Merge branch 'jk/strvec'	2020-08-10 10:23:57 -07:00
fsmonitor.h	…
fuzz-commit-graph.c	commit-graph: pass a 'struct repository *' in more places	2020-09-09 12:51:48 -07:00
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	Fit to Plan 9's ANSI/POSIX compatibility layer	2020-09-09 22:31:31 -07:00
generate-configlist.sh	…
gettext.c	gettext.c: remove/reword a mostly-useless comment	2021-01-11 13:07:33 -08:00
gettext.h	…
git-add--interactive.perl	Merge branch 'js/add-i-color-fix'	2020-12-08 15:11:17 -08:00
git-archimport.perl	…
git-bisect.sh	Merge branch 'mr/bisect-in-c-3'	2020-11-09 14:06:25 -08:00
git-compat-util.h	git-compat-util: always enable variadic macros	2021-01-27 22:14:37 -08:00
git-cvsexportcommit.perl	cvsexportcommit: do not run git programs in dashed form	2020-08-26 14:49:52 -07:00
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	Merge branch 'pb/mergetool-tool-help-fix' into maint	2021-02-05 16:31:24 -08:00
git-mergetool.sh	…
git-p4.py	Merge branch 'dl/p4-encode-after-kw-expansion' into maint	2021-02-08 14:05:54 -08:00
git-quiltimport.sh	…
git-rebase--preserve-merges.sh	rebase: remove unused function reschedule_last_action	2020-08-12 12:25:42 -07:00
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	submodule: fix fetch_in_submodule logic	2020-11-24 13:14:09 -08:00
git-svn.perl	perl: check for perl warnings while running tests	2020-10-21 23:11:48 -07:00
git-web--browse.sh	…
git.c	Merge branch 'ps/config-env-pairs'	2021-01-25 14:19:19 -08:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	grep: copy struct in one fell swoop	2020-11-30 13:55:54 -08:00
grep.h	grep: use designated initializers for `grep_defaults`	2020-11-21 14:50:33 -08:00
hash-lookup.c	hash-lookup: rename from sha1-lookup	2021-01-04 13:01:55 -08:00
hash-lookup.h	hash-lookup: rename from sha1-lookup	2021-01-04 13:01:55 -08:00
hash.h	cache.h: move hash/oid functions to hash.h	2020-12-04 13:55:14 -08:00
hashmap.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
hashmap.h	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
help.c	help.c: help.autocorrect=never means "do not compute suggestions"	2020-11-25 13:02:15 -08: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	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	Merge branch 'pw/rebase-i-more-options'	2020-09-03 12:37:01 -07:00
imap-send.c	imap-send: parse default git config	2020-12-01 11:10:59 -08:00
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	line-log: handle deref_tag() returning NULL	2020-10-12 12:25:14 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	list-objects-filter-options: fix function name in BUG	2020-11-16 14:28:25 -08:00
list-objects-filter-options.h	list_objects_filter_options: introduce 'list_object_filter_config_name'	2020-08-03 18:03:24 -07:00
list-objects-filter.c	object-name.c: rename from sha1-name.c	2021-01-04 13:01:55 -08:00
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 'so/log-diff-merge'	2021-02-05 16:40:44 -08:00
log-tree.h	format-patch: make output filename configurable	2020-11-09 17:44:41 -08:00
ls-refs.c	Merge branch 'tb/ls-refs-optim'	2021-02-05 16:40:45 -08:00
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	mailmap: only look for .mailmap in work tree	2021-02-10 13:34:51 -08:00
mailmap.h	shortlog: remove unused(?) "repo-abbrev" feature	2021-01-12 14:04:42 -08:00
match-trees.c	…
mem-pool.c	mem-pool: use consistent pool variable name	2020-08-18 12:16:08 -07:00
mem-pool.h	mem-pool: use consistent pool variable name	2020-08-18 12:16:08 -07:00
merge-blobs.c	…
merge-blobs.h	…
merge-ort-wrappers.c	merge-ort-wrappers: new convience wrappers to mimic the old merge API	2020-10-26 22:36:14 -07:00
merge-ort-wrappers.h	merge-ort-wrappers: new convience wrappers to mimic the old merge API	2020-10-26 22:36:14 -07:00
merge-ort.c	Merge branch 'en/ort-conflict-handling'	2021-02-05 16:40:44 -08:00
merge-ort.h	merge-ort: implement merge_incore_recursive()	2020-12-16 21:56:39 -08:00
merge-recursive.c	commit: move reverse_commit_list() from merge-recursive	2020-12-16 21:56:39 -08:00
merge-recursive.h	merge-recursive: fix unclear and outright wrong comments	2020-08-02 11:03:57 -07:00
merge.c	dir: fix problematic API to avoid memory leaks	2020-08-18 17:17:31 -07:00
mergesort.c	…
mergesort.h	…
midx.c	Merge branch 'ma/more-opaque-lock-file'	2021-01-25 14:19:17 -08:00
midx.h	…
name-hash.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	Merge branch 'na/notes-displayref-is-not-boolean'	2020-11-30 14:49:44 -08:00
notes.h	…
object-file.c	hash-lookup: rename from sha1-lookup	2021-01-04 13:01:55 -08:00
object-name.c	object-name.c: rename from sha1-name.c	2021-01-04 13:01:55 -08:00
object-store.h	sha1-file: introduce no-lazy-fetch has_object()	2020-08-06 13:01:02 -07:00
object.c	bundle: lost objects when removing duplicate pendings	2021-01-11 21:50:41 -08:00
object.h	object: allow clear_commit_marks_all to handle any repo	2020-10-31 10:46:34 -07:00
oid-array.c	hash-lookup: rename from sha1-lookup	2021-01-04 13:01:55 -08:00
oid-array.h	oid-array: provide a for-loop iterator	2020-12-07 12:32:04 -08:00
oidmap.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
oidmap.h	…
oidset.c	blame: silently ignore invalid ignore file objects	2020-11-10 13:05:06 -08:00
oidset.h	blame: validate and peel the object names on the ignore list	2020-09-24 22:20:58 -07:00
pack-bitmap-write.c	Merge branch 'ma/sha1-is-a-hash'	2021-01-15 15:20:29 -08:00
pack-bitmap.c	rebuild_existing_bitmaps(): convert to new revindex API	2021-01-13 21:53:46 -08:00
pack-bitmap.h	pack-bitmap: factor out 'bitmap_for_commit()'	2020-12-08 14:49:04 -08:00
pack-check.c	fsck: correctly compute checksums on idx files larger than 4GB	2020-11-16 13:41:35 -08:00
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	pack-revindex.c: avoid direct revindex access in 'offset_to_pack_pos()'	2021-01-13 21:53:48 -08:00
pack-revindex.h	pack-revindex: hide the definition of 'revindex_entry'	2021-01-13 21:53:48 -08:00
pack-write.c	pack-write: die on error in write_promisor_file()	2021-01-14 17:02:22 -08:00
pack.h	fetch-pack: refactor writing promisor file	2021-01-12 16:01:07 -08:00
packfile.c	Merge branch 'tb/pack-revindex-api'	2021-01-25 14:19:20 -08:00
packfile.h	midx: traverse the local MIDX first	2020-08-28 14:07:09 -07:00
pager.c	…
parse-options-cb.c	assert PARSE_OPT_NONEG in parse-options callbacks	2020-09-30 12:53:47 -07:00
parse-options.c	parse-options: add --git-completion-helper-all	2020-08-19 17:46:17 -07:00
parse-options.h	parse-options: format argh like error messages	2021-01-06 15:10:27 -08:00
patch-delta.c	…
patch-ids.c	Merge branch 'jk/log-cherry-pick-duplicate-patches' into maint	2021-02-05 16:31:28 -08:00
patch-ids.h	patch-ids: handle duplicate hashmap entries	2021-01-12 11:13:32 -08:00
path.c	sequencer: treat REVERT_HEAD as a pseudo ref	2020-08-21 11:20:11 -07:00
path.h	sequencer: treat REVERT_HEAD as a pseudo ref	2020-08-21 11:20:11 -07:00
pathspec.c	…
pathspec.h	…
pkt-line.c	sideband: diagnose more sideband anomalies	2020-10-29 09:23:29 -07:00
pkt-line.h	…
preload-index.c	…
pretty.c	shortlog: remove unused(?) "repo-abbrev" feature	2021-01-12 14:04:42 -08:00
pretty.h	pretty: refactor `format_sanitized_subject()`	2020-08-28 13:52:51 -07:00
prio-queue.c	…
prio-queue.h	…
progress.c	Merge branch 'ma/stop-progress-null-fix'	2020-08-17 17:02:48 -07:00
progress.h	…
promisor-remote.c	promisor-remote: remove unused variable	2020-09-21 22:32:49 -07:00
promisor-remote.h	promisor-remote: remove unused variable	2020-09-21 22:32:49 -07:00
prompt.c	…
prompt.h	…
protocol.c	protocol: re-enable v2 protocol by default	2020-09-25 11:40:42 -07:00
protocol.h	…
prune-packed.c	…
prune-packed.h	…
quote.c	quote: make sq_dequote_step() a public function	2021-01-12 12:03:18 -08:00
quote.h	quote: make sq_dequote_step() a public function	2021-01-12 12:03:18 -08:00
range-diff.c	Use new HASHMAP_INIT macro to simplify hashmap initialization	2020-11-11 12:55:27 -08:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	read-cache: try not to peek into `struct {lock_,temp}file`	2021-01-06 13:53:32 -08:00
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'tb/ls-refs-optim'	2021-02-05 16:40:45 -08:00
ref-filter.h	branch: sort detached HEAD based on a flag	2021-01-07 15:13:21 -08:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'tb/ls-refs-optim'	2021-02-05 16:40:45 -08:00
refs.h	Merge branch 'tb/ls-refs-optim'	2021-02-05 16:40:45 -08:00
refspec.c	Merge branch 'fc/atmark-in-refspec'	2020-12-14 10:21:36 -08:00
refspec.h	Merge branch 'sb/clone-origin'	2020-10-27 15:09:50 -07:00
remote-curl.c	push: parse and set flag for "--force-if-includes"	2020-10-03 09:59:19 -07:00
remote.c	Merge branch 'nk/refspecs-negative-fix'	2020-12-23 13:59:46 -08:00
remote.h	fetch: extract writing to FETCH_HEAD	2021-01-12 12:06:14 -08:00
replace-object.c	…
replace-object.h	…
repo-settings.c	Merge branch 'ds/maintenance-part-2'	2020-10-27 15:09:47 -07:00
repository.c	…
repository.h	Merge branch 'ds/maintenance-part-2'	2020-10-27 15:09:47 -07:00
rerere.c	hash-lookup: rename from sha1-lookup	2021-01-04 13:01:55 -08:00
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'so/log-diff-merge'	2021-02-05 16:40:44 -08:00
revision.h	Merge branch 'so/log-diff-merge'	2021-02-05 16:40:44 -08:00
run-command.c	maintenance: optionally skip --auto process	2020-09-25 10:59:44 -07:00
run-command.h	run-command: document use_shell option	2021-01-22 14:21:32 -08:00
send-pack.c	Merge branch 'js/trace2-session-id'	2020-12-08 15:11:20 -08:00
send-pack.h	…
sequencer.c	Merge branch 'en/strmap'	2020-11-21 15:14:38 -08:00
sequencer.h	Merge branch 'en/merge-ort-api-null-impl'	2020-11-18 13:32:53 -08:00
serve.c	upload-pack, serve: log received client session ID	2020-11-11 18:26:53 -08:00
serve.h	…
server-info.c	…
setup.c	Merge branch 'bc/sha-256-part-3'	2020-08-11 18:04:11 -07:00
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shell.c	…
shortlog.h	shortlog: remove unused(?) "repo-abbrev" feature	2021-01-12 14:04:42 -08:00
sideband.c	Merge branch 'jk/sideband-more-error-checking'	2020-11-09 14:06:29 -08:00
sideband.h	sideband: diagnose more sideband anomalies	2020-10-29 09:23:29 -07:00
sigchain.c	…
sigchain.h	…
split-index.c	mem-pool: use more standard initialization and finalization	2020-08-18 12:16:06 -07:00
split-index.h	…
stable-qsort.c	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
strmap.c	strmap: take advantage of FLEXPTR_ALLOC_STR when relevant	2020-11-11 12:55:27 -08:00
strmap.h	strmap: make callers of strmap_remove() to call it in void context	2020-12-15 15:30:44 -08:00
strvec.c	…
strvec.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
submodule-config.h	…
submodule.c	Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'	2021-01-25 14:19:18 -08:00
submodule.h	submodule: rename helper functions to avoid ambiguity	2020-08-12 14:12:58 -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	…
trace2.c	trace2: add a public function for getting the SID	2020-11-11 18:26:52 -08:00
trace2.h	trace2: add a public function for getting the SID	2020-11-11 18:26:52 -08:00
trailer.c	pretty format %(trailers): add a "key_value_separator"	2020-12-09 14:16:42 -08:00
trailer.h	pretty format %(trailers): add a "key_value_separator"	2020-12-09 14:16:42 -08:00
transport-helper.c	push: parse and set flag for "--force-if-includes"	2020-10-03 09:59:19 -07:00
transport-internal.h	…
transport.c	transport: log received server session ID	2020-11-11 18:26:53 -08:00
transport.h	push: parse and set flag for "--force-if-includes"	2020-10-03 09:59:19 -07:00
tree-diff.c	bloom/diff: properly short-circuit on max_changes	2020-09-17 09:31:25 -07:00
tree-walk.c	tree-walk: report recursion counts	2021-01-04 15:23:08 -08:00
tree-walk.h	…
tree.c	tree: enable cmp_cache_name_compare() to be used elsewhere	2020-12-13 14:18:20 -08:00
tree.h	tree: enable cmp_cache_name_compare() to be used elsewhere	2020-12-13 14:18:20 -08:00
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	unpack-trees: add trace2 regions	2021-01-04 15:23:08 -08:00
unpack-trees.h	…
upload-pack.c	refs: switch peel_ref() to peel_iterated_oid()	2021-01-21 15:51:31 -08:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	Merge branch 'jt/trace-error-on-warning'	2020-12-08 15:11:17 -08:00
userdiff.c	Merge branch 've/userdiff-bash'	2020-11-02 13:17:46 -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: teach `repair` to fix multi-directional breakage	2020-12-21 13:44:28 -08:00
worktree.h	Merge branch 'ma/worktree-cleanups'	2020-10-05 14:01:52 -07:00
wrap-for-bin.sh	…
wrapper.c	xrealloc: do not reuse pointer freed by zero-length realloc()	2020-09-02 12:18:14 -07:00
write-or-die.c	…
ws.c	…
wt-status.c	Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'	2021-01-25 14:19:18 -08:00
wt-status.h	branch: sort detached HEAD based on a flag	2021-01-07 15:13:21 -08:00
xdiff-interface.c	…
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