A fork of Git containing Microsoft-specific patches.

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

David Aguilar 853e10c197 difftool: fix dir-diff index creation when in a subdirectory `9ec26e7977` (difftool: fix argument handling in subdirs, 2016-07-18) corrected how path arguments are handled in a subdirectory, but it introduced a regression in how entries outside of the subdirectory are handled by dir-diff. When preparing the right-side of the diff we only include the changed paths in the temporary area. The left side of the diff is constructed from a temporary index that is built from the same set of changed files, but it was being constructed from within the subdirectory. This is a problem because the indexed paths are toplevel-relative, and thus they were not getting added to the index. Teach difftool to chdir to the toplevel of the repository before preparing its temporary indexes. This ensures that all of the toplevel-relative paths are valid. Add test cases to more thoroughly exercise this scenario. Reported-by: Frank Becker <fb@mooflu.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2016-12-08 10:28:00 -08:00
Documentation	Prepare for 2.9.4	2016-09-08 21:37:59 -07:00
block-sha1	sha1: provide another level of indirection for the SHA-1 functions	2015-11-05 10:35:11 -08:00
builtin	Merge branch 'jk/tighten-alloc' into maint	2016-09-08 21:36:00 -07:00
ci	travis-ci: build documentation	2016-05-10 11:19:07 -07:00
compat	Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint	2016-09-08 21:35:56 -07:00
contrib	Merge branch 'js/import-tars-hardlinks' into maint	2016-09-08 21:35:54 -07:00
ewah	ewah: convert to REALLOC_ARRAY, etc	2016-02-22 14:51:09 -08:00
git-gui	git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution	2015-12-27 15:33:13 -08:00
gitk-git	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	2016-03-20 18:05:10 -07:00
gitweb	gitweb: escape link body in format_ref_marker	2016-08-01 12:55:40 -07:00
mergetools	mergetools: add support for ExamDiff	2016-04-04 09:15:14 -07:00
perl	Merge branch 'lp/typofixes'	2016-05-17 14:38:20 -07:00
po	l10n: ko.po: Update Korean translation	2016-06-12 01:25:58 +09:00
ppc	sha1: provide another level of indirection for the SHA-1 functions	2015-11-05 10:35:11 -08:00
refs	Merge branch 'dt/pre-refs-backend'	2016-04-25 15:17:15 -07:00
t	difftool: fix dir-diff index creation when in a subdirectory	2016-12-08 10:28:00 -08:00
templates	Merge branch 'ma/update-hooks-sample-typofix' into maint	2016-03-10 11:13:50 -08:00
vcs-svn	vcs-svn: use error_errno()	2016-05-09 12:29:08 -07:00
xdiff	Merge branch 'js/ignore-space-at-eol' into maint	2016-08-08 14:21:35 -07:00
.gitattributes	.gitattributes: set file type for C files	2016-07-07 14:11:15 -07:00
.gitignore	test helpers: move test-* to t/helper/ subdirectory	2016-04-15 10:12:19 -07:00
.mailmap	mailmap: use main email address for dturner	2016-07-06 10:57:01 -07:00
.travis.yml	Merge branch 'ls/travis-enable-httpd-tests' into maint	2016-08-10 11:55:23 -07:00
COPYING	…
GIT-VERSION-GEN	Git 2.9.3	2016-08-12 09:17:51 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'jk/common-main' into maint	2016-09-08 21:35:51 -07:00
README.md	README.md: format CLI commands with code syntax	2016-05-31 08:54:24 -07:00
RelNotes	Prepare for 2.9.4	2016-09-08 21:37:59 -07:00
abspath.c	Windows: shorten code by re-using convert_slashes()	2016-04-04 18:03:02 -07:00
aclocal.m4	…
advice.c	merge: grammofix in please-commit-before-merge message	2015-10-02 14:29:56 -07:00
advice.h	pull: check if in unresolved merge state	2015-06-18 13:17:16 -07:00
alias.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
alloc.c	…
archive-tar.c	archive-tar: convert snprintf to xsnprintf	2016-05-26 10:44:26 -07:00
archive-zip.c	Merge branch 'rs/archive-zip-many' into maint	2015-09-03 19:18:01 -07:00
archive.c	use st_add and st_mult for allocation size computation	2016-02-22 14:51:09 -08:00
archive.h	…
argv-array.c	argv-array: add detach function	2016-02-22 14:50:32 -08:00
argv-array.h	argv-array: add detach function	2016-02-22 14:50:32 -08:00
attr.c	Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint	2016-04-14 18:37:15 -07:00
attr.h	…
base85.c	…
bisect.c	Merge branch 'jk/bisect-show-tree' into maint	2016-07-11 10:44:11 -07:00
bisect.h	bisect: simplify the addition of new bisect terms	2015-08-03 11:42:41 -07:00
blob.c	…
blob.h	…
branch.c	worktree.c: check whether branch is rebased in another worktree	2016-04-22 14:09:38 -07:00
branch.h	worktree.c: check whether branch is rebased in another worktree	2016-04-22 14:09:38 -07:00
builtin.h	Merge branch 'sb/submodule-helper'	2015-10-05 12:30:19 -07:00
bulk-checkin.c	use xsnprintf for generating git object headers	2015-09-25 10:18:18 -07:00
bulk-checkin.h	…
bundle.c	bundle: don't leak an fd in case of early return	2016-04-01 10:33:18 -07:00
bundle.h	…
cache-tree.c	cache-tree: do not generate empty trees as a result of all i-t-a subentries	2016-07-18 13:45:33 -07:00
cache-tree.h	cache-tree: introduce write_index_as_tree()	2015-08-04 22:02:11 -07:00
cache.h	Merge branch 'jk/reflog-date' into maint	2016-09-08 21:35:52 -07:00
check-builtins.sh	…
check-racy.c	check-racy.c: use error_errno()	2016-05-09 12:29:08 -07:00
check_bindir	…
color.c	color: add color_set helper for copying raw colors	2015-10-05 11:08:05 -07:00
color.h	Merge branch 'js/color-on-windows-comment' into maint	2016-07-28 11:25:55 -07:00
column.c	use xmallocz to avoid size arithmetic	2016-02-22 14:51:09 -08:00
column.h	…
combine-diff.c	combine-diff.c: use error_errno()	2016-05-09 12:29:08 -07:00
command-list.txt	Merge branch 'nd/multiple-work-trees'	2015-07-13 14:02:02 -07:00
commit-slab.h	Merge branch 'jc/commit-slab'	2015-08-03 11:01:21 -07:00
commit.c	commit: use FLEX_ARRAY in struct merge_remote_desc	2016-08-13 19:48:07 -07:00
commit.h	commit: use FLEX_ARRAY in struct merge_remote_desc	2016-08-13 19:48:07 -07:00
common-main.c	mingw: declare main()'s argv as const	2016-07-06 08:11:47 -07:00
config.c	Merge branch 'pc/occurred' into maint	2016-07-06 13:06:43 -07:00
config.mak.in	…
config.mak.uname	config.mak.uname: correct perl path on FreeBSD	2016-07-26 09:43:06 -07:00
configure.ac	Merge branch 'ew/autoconf-pthread' into maint	2016-08-10 11:55:21 -07:00
connect.c	Merge branch 'cn/deprecate-ssh-git-url'	2016-03-16 13:16:40 -07:00
connect.h	connect & http: support -4 and -6 switches for remote operations	2016-02-12 11:34:14 -08:00
connected.c	connected.c: use error_errno()	2016-05-09 12:29:08 -07:00
connected.h	…
convert.c	convert: unify the "auto" handling of CRLF	2016-07-06 11:53:51 -07:00
convert.h	convert: unify the "auto" handling of CRLF	2016-07-06 11:53:51 -07:00
copy.c	copy.c: use error_errno()	2016-05-09 12:29:08 -07:00
credential-cache--daemon.c	Merge branch 'jk/common-main-2.8' into jk/common-main	2016-07-06 10:02:57 -07:00
credential-cache.c	add an extra level of indirection to main()	2016-07-01 15:09:10 -07:00
credential-store.c	add an extra level of indirection to main()	2016-07-01 15:09:10 -07:00
credential.c	credential: let empty credential specs reset helper list	2016-02-26 10:58:14 -08:00
credential.h	…
csum-file.c	sha1fd_check: die when we cannot open the file	2015-03-19 13:35:15 -07:00
csum-file.h	…
ctype.c	kwset: use unsigned char to store values with high-bit set	2015-03-02 12:32:24 -08:00
daemon.c	Merge branch 'jk/common-main' into maint	2016-09-08 21:35:51 -07:00
date.c	date: add "unix" format	2016-07-27 14:15:51 -07:00
decorate.c	Remove get_object_hash.	2015-11-20 08:02:05 -05:00
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	Remove get_object_hash.	2015-11-20 08:02:05 -05:00
diff-no-index.c	diff-no-index.c: use error_errno()	2016-05-09 12:29:08 -07:00
diff.c	Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint	2016-08-10 11:55:28 -07:00
diff.h	Merge branch 'mm/diff-renames-default'	2016-04-03 10:29:22 -07:00
diffcore-break.c	…
diffcore-delta.c	use st_add and st_mult for allocation size computation	2016-02-22 14:51:09 -08:00
diffcore-order.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
diffcore-pickaxe.c	diffcore-pickaxe: support case insensitive match on non-ascii	2016-07-01 12:44:57 -07:00
diffcore-rename.c	Merge branch 'sg/diff-multiple-identical-renames' into maint	2016-04-29 14:15:55 -07:00
diffcore.h	…
dir.c	Merge branch 'rs/use-strbuf-addbuf' into maint	2016-08-08 14:21:42 -07:00
dir.h	Merge branch 'nd/worktree-various-heads'	2016-05-23 14:54:29 -07:00
editor.c	editor.c: use error_errno()	2016-05-09 12:29:08 -07:00
entry.c	entry.c: use error_errno()	2016-05-09 12:29:08 -07:00
environment.c	Merge branch 'js/windows-dotgit' into maint	2016-05-26 13:17:23 -07:00
exec_cmd.c	Merge branch 'ak/extract-argv0-last-dir-sep' into maint	2016-03-10 11:13:47 -08:00
exec_cmd.h	prepare_{git,shell}_cmd: use argv_array	2016-02-22 14:51:09 -08:00
fast-import.c	Merge branch 'jk/common-main-2.8' into jk/common-main	2016-07-06 10:02:57 -07:00
fetch-pack.c	fetch-pack: isolate sigpipe in demuxer thread	2016-04-20 13:33:56 -07:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	Merge branch 'jc/fsck-nul-in-commit'	2016-05-17 14:38:34 -07:00
fsck.h	fsck: git receive-pack: support excluding objects from fsck'ing	2015-06-23 14:27:37 -07:00
generate-cmdlist.sh	generate-cmdlist: re-implement as shell script	2015-08-25 11:24:31 -07:00
gettext.c	gettext: add is_utf8_locale()	2016-07-01 12:44:57 -07:00
gettext.h	gettext: add is_utf8_locale()	2016-07-01 12:44:57 -07:00
git-add--interactive.perl	add--interactive: respect diff.compactionHeuristic	2016-06-16 11:38:58 -07:00
git-archimport.perl	…
git-bisect.sh	bisect: allow setting any user-specified in 'git bisect start'	2015-08-03 11:42:43 -07:00
git-compat-util.h	Merge branch 'jk/tighten-alloc' into maint	2016-09-08 21:36:00 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	Merge branch 'cn/cvsimport-perl-update'	2015-06-25 11:08:08 -07:00
git-cvsserver.perl	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
git-difftool--helper.sh	difftool: always honor fatal error exit codes	2016-08-15 15:24:05 -07:00
git-difftool.perl	difftool: fix dir-diff index creation when in a subdirectory	2016-12-08 10:28:00 -08:00
git-filter-branch.sh	Merge branch 'jk/filter-branch-no-index' into maint	2016-02-05 14:54:13 -08:00
git-instaweb.sh	git-instaweb: use @SHELL_PATH@ instead of /bin/sh	2015-03-10 15:10:35 -07:00
git-merge-octopus.sh	merge-octopus: abort if index does not match HEAD	2016-04-12 18:39:43 -07:00
git-merge-one-file.sh	Merge branch 'jk/no-diff-emit-common' into maint	2016-03-10 11:13:42 -08:00
git-merge-resolve.sh	…
git-mergetool--lib.sh	Merge branch 'nf/mergetool-prompt'	2016-05-03 14:08:17 -07:00
git-mergetool.sh	Merge branch 'nf/mergetool-prompt' into HEAD	2016-05-18 14:40:07 -07:00
git-p4.py	Merge branch 'ao/p4-has-branch-prefix-fix' into maint	2016-07-11 10:44:16 -07:00
git-parse-remote.sh	i18n: git-parse-remote.sh: mark strings for translation	2016-04-19 12:07:49 -07:00
git-quiltimport.sh	git-quiltimport: add commandline option --series <file>	2015-09-01 11:10:07 -07:00
git-rebase--am.sh	rebase: update comment about FreeBSD /bin/sh	2016-06-17 11:04:38 -07:00
git-rebase--interactive.sh	Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maint	2016-07-28 11:25:52 -07:00
git-rebase--merge.sh	Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint	2016-07-06 13:06:41 -07:00
git-rebase.sh	Merge branch 'jc/commit-tree-ignore-commit-gpgsign'	2016-05-13 13:18:27 -07:00
git-relink.perl	…
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'jd/send-email-to-whom' into HEAD	2016-05-18 14:40:07 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	Merge branch 'lc/shell-default-value-noexpand' into maint	2016-07-11 10:44:13 -07:00
git-stash.sh	always quote shell arguments to test -z/-n	2016-05-14 10:37:29 -07:00
git-submodule.sh	Merge branch 'sb/submodule-deinit-all' into maint	2016-08-08 14:21:46 -07:00
git-svn.perl	git-svn: fix URL canonicalization during init w/ SVN 1.7+	2016-03-16 20:16:23 +00:00
git-web--browse.sh	…
git.c	common-main: call git_setup_gettext()	2016-07-01 15:09:10 -07:00
git.rc	…
gpg-interface.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
gpg-interface.h	verify-commit: add option to print raw gpg status information	2015-06-22 14:20:47 -07:00
graph.c	pretty: pass graph width to pretty formatting for use in '%>\|(N)'	2016-06-16 11:43:36 -07:00
graph.h	pretty: pass graph width to pretty formatting for use in '%>\|(N)'	2016-06-16 11:43:36 -07:00
grep.c	Merge branch 'jc/grep-commandline-vs-configuration' into maint	2016-08-10 11:55:29 -07:00
grep.h	Merge branch 'jc/grep-commandline-vs-configuration' into maint	2016-08-10 11:55:29 -07:00
hashmap.c	convert trivial cases to FLEX_ARRAY macros	2016-02-22 14:51:09 -08:00
hashmap.h	…
help.c	t0006: skip "far in the future" test when unsigned long is not long enough	2016-07-15 09:05:53 -07:00
help.h	…
hex.c	add reentrant variants of sha1_to_hex and find_unique_abbrev	2015-09-25 10:18:18 -07:00
http-backend.c	Merge branch 'jk/common-main-2.8' into jk/common-main	2016-07-06 10:02:57 -07:00
http-fetch.c	common-main: call git_setup_gettext()	2016-07-01 15:09:10 -07:00
http-push.c	Merge branch 'jk/common-main' into maint	2016-09-08 21:35:51 -07:00
http-walker.c	http-walker: store url in a strbuf	2015-09-25 10:18:18 -07:00
http.c	use strbuf_addstr() instead of strbuf_addf() with "%s"	2016-08-05 15:09:25 -07:00
http.h	http: support sending custom HTTP headers	2016-04-27 14:02:33 -07:00
ident.c	Merge branch 'jk/reset-ident-time-per-commit' into maint	2016-08-12 09:16:56 -07:00
imap-send.c	common-main: call git_setup_gettext()	2016-07-01 15:09:10 -07:00
khash.h	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
kwset.c	kwset: use unsigned char to store values with high-bit set	2015-03-02 12:32:24 -08:00
kwset.h	kwset: use unsigned char to store values with high-bit set	2015-03-02 12:32:24 -08:00
levenshtein.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
levenshtein.h	…
line-log.c	Merge branch 'jc/deref-tag' into maint	2016-07-06 13:06:46 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
list-objects.c	struct name_entry: use struct object_id instead of unsigned char sha1[20]	2016-04-25 14:23:42 -07:00
list-objects.h	list-objects: pass full pathname to callbacks	2016-03-16 10:41:04 -07:00
ll-merge.c	Merge branch 'jc/ll-merge-internal'	2016-05-17 14:38:32 -07:00
ll-merge.h	…
lockfile.c	lockfile: improve error message when lockfile exists	2016-03-01 10:16:46 -08:00
lockfile.h	mingw: ensure temporary file handles are not inherited by child processes	2016-08-23 09:09:55 -07:00
log-tree.c	pretty: pass graph width to pretty formatting for use in '%>\|(N)'	2016-06-16 11:43:36 -07:00
log-tree.h	…
mailinfo.c	Merge branch 'rs/mailinfo-lib' into maint	2016-09-08 21:36:01 -07:00
mailinfo.h	mailinfo: remove calls to exit() and die() deep in the callchain	2015-10-21 15:59:34 -07:00
mailmap.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
mailmap.h	…
match-trees.c	match-trees: convert several leaf functions to use struct object_id	2016-04-25 14:26:29 -07:00
merge-blobs.c	Merge branch 'jk/no-diff-emit-common' into maint	2016-03-10 11:13:42 -08:00
merge-blobs.h	…
merge-recursive.c	Merge branch 'rs/merge-recursive-string-list-init' into maint	2016-09-08 21:35:59 -07:00
merge-recursive.h	merge-recursive: option to disable renames	2016-02-17 10:20:51 -08:00
merge.c	Convert struct object to object_id	2015-11-20 08:02:05 -05:00
mergesort.c	…
mergesort.h	…
name-hash.c	convert trivial cases to FLEX_ARRAY macros	2016-02-22 14:51:09 -08:00
notes-cache.c	notes: allow treeish expressions as notes ref	2016-01-12 15:10:01 -08:00
notes-cache.h	…
notes-merge.c	notes-merge: use O_EXCL to avoid overwriting existing files	2016-07-07 14:16:26 -07:00
notes-merge.h	notes: extract enum notes_merge_strategy to notes-utils.h	2015-08-17 15:36:23 -07:00
notes-utils.c	notes: allow treeish expressions as notes ref	2016-01-12 15:10:01 -08:00
notes-utils.h	notes: extract parse_notes_merge_strategy to notes-utils	2015-08-17 15:38:32 -07:00
notes.c	struct name_entry: use struct object_id instead of unsigned char sha1[20]	2016-04-25 14:23:42 -07:00
notes.h	Merge branch 'jk/notes-merge-from-anywhere'	2016-02-03 14:15:59 -08:00
object.c	Remove get_object_hash.	2015-11-20 08:02:05 -05:00
object.h	Remove get_object_hash.	2015-11-20 08:02:05 -05:00
pack-bitmap-write.c	Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7	2016-03-16 10:42:32 -07:00
pack-bitmap.c	Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7	2016-03-16 10:42:32 -07:00
pack-bitmap.h	…
pack-check.c	fsck: use streaming interface for large blobs in pack	2016-07-13 09:15:29 -07:00
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
pack-revindex.h	pack-revindex: store entries directly in packed_git	2015-12-21 14:36:28 -08:00
pack-write.c	…
pack.h	fsck: use streaming interface for large blobs in pack	2016-07-13 09:15:29 -07:00
pager.c	Merge branch 'jc/am-i-v-fix' into maint	2016-03-10 11:13:41 -08:00
parse-options-cb.c	parse_options: allocate a new array when concatenating	2016-07-06 10:11:08 -07:00
parse-options.c	parse-options.c: make OPTION_COUNTUP respect "unspecified" values	2016-05-05 11:52:45 -07:00
parse-options.h	parse_options: allocate a new array when concatenating	2016-07-06 10:11:08 -07:00
patch-delta.c	…
patch-ids.c	patch-ids: make commit_patch_id() a public helper function	2016-04-26 10:49:57 -07:00
patch-ids.h	patch-ids: make commit_patch_id() a public helper function	2016-04-26 10:49:57 -07:00
path.c	Merge branch 'rs/use-strbuf-addbuf' into maint	2016-08-08 14:21:42 -07:00
pathspec.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
pathspec.h	…
pkt-line.c	pkt-line: show packets in async processes as "sideband"	2015-09-01 15:11:57 -07:00
pkt-line.h	…
preload-index.c	…
pretty.c	use strbuf_add_unique_abbrev() for adding short hashes	2016-08-06 10:33:57 -07:00
prio-queue.c	…
prio-queue.h	…
progress.c	use xmallocz to avoid size arithmetic	2016-02-22 14:51:09 -08:00
progress.h	…
prompt.c	…
prompt.h	…
quote.c	Merge branch 'nd/icase' into maint	2016-07-28 11:26:03 -07:00
quote.h	Merge branch 'nd/icase' into maint	2016-07-28 11:26:03 -07:00
reachable.c	reachable.c: use error_errno()	2016-05-09 12:29:08 -07:00
reachable.h	…
read-cache.c	Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint	2016-09-08 21:35:52 -07:00
ref-filter.c	ref-filter.c: mark strings for translation	2016-02-29 14:27:58 -08:00
ref-filter.h	branch.c: use 'ref-filter' APIs	2015-09-25 08:54:54 -07:00
reflog-walk.c	reflog: continue walking the reflog past root commits	2016-06-06 15:06:44 -07:00
reflog-walk.h	convert "enum date_mode" into a struct	2015-06-29 11:39:07 -07:00
refs.c	refs: move resolve_ref_unsafe into common code	2016-04-10 11:35:41 -07:00
refs.h	refs.h: fix misspelt "occurred" in a comment	2016-06-10 14:53:32 -07:00
remote-curl.c	Merge branch 'jk/common-main-2.8' into jk/common-main	2016-07-06 10:02:57 -07:00
remote-testsvn.c	common-main: call git_extract_argv0_path()	2016-07-01 15:09:10 -07:00
remote.c	Merge branch 'jk/push-force-with-lease-creation' into maint	2016-09-08 21:35:53 -07:00
remote.h	Merge branch 'jk/push-force-with-lease-creation' into maint	2016-09-08 21:35:53 -07:00
replace_object.c	register_replace_ref(): rewrite to take an object_id argument	2015-05-25 12:19:35 -07:00
rerere.c	Merge branch 'jc/rerere-multi'	2016-05-23 14:54:38 -07:00
rerere.h	Merge branch 'jc/rerere-multi'	2016-04-25 15:17:15 -07:00
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jc/grep-commandline-vs-configuration' into maint	2016-08-10 11:55:29 -07:00
revision.h	Merge branch 'lt/pretty-expand-tabs'	2016-04-13 14:12:36 -07:00
run-command.c	Merge branch 'jk/push-client-deadlock-fix' into HEAD	2016-05-18 14:40:06 -07:00
run-command.h	Merge branch 'jk/push-client-deadlock-fix' into HEAD	2016-05-18 14:40:06 -07:00
send-pack.c	Merge branch 'rs/use-strbuf-addstr' into maint	2016-08-10 11:55:34 -07:00
send-pack.h	push: support signing pushes iff the server supports it	2015-08-19 12:58:45 -07:00
sequencer.c	use strbuf_addstr() instead of strbuf_addf() with "%s"	2016-08-05 15:09:25 -07:00
sequencer.h	…
server-info.c	server-info.c: use error_errno()	2016-05-09 12:29:08 -07:00
setup.c	Merge branch 'jc/xstrfmt-null-with-prec-0' into maint	2016-05-02 14:24:14 -07:00
sh-i18n--envsubst.c	add an extra level of indirection to main()	2016-07-01 15:09:10 -07:00
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'nd/pack-ofs-4gb-limit' into maint	2016-08-08 14:21:36 -07:00
sha1_name.c	Merge branch 'bc/object-id'	2016-05-06 14:45:44 -07:00
shallow.c	use st_add and st_mult for allocation size computation	2016-02-22 14:51:09 -08:00
shell.c	common-main: call git_setup_gettext()	2016-07-01 15:09:10 -07:00
shortlog.h	…
show-index.c	common-main: call git_setup_gettext()	2016-07-01 15:09:10 -07:00
sideband.c	Merge branch 'lf/recv-sideband-cleanup' into maint	2016-08-08 14:21:41 -07:00
sideband.h	sideband.c: make send_sideband() return void	2016-06-16 11:40:19 -07:00
sigchain.c	sigchain: add command to pop all common signals	2015-12-16 12:06:08 -08:00
sigchain.h	sigchain: add command to pop all common signals	2015-12-16 12:06:08 -08:00
split-index.c	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
split-index.h	…
strbuf.c	Merge branch 'rs/use-strbuf-addbuf' into maint	2016-08-08 14:21:42 -07:00
strbuf.h	Merge branch 'rs/use-strbuf-addbuf' into maint	2016-08-08 14:21:42 -07:00
streaming.c	Merge branch 'sb/plug-streaming-leak'	2015-04-14 11:49:09 -07:00
streaming.h	…
string-list.c	string_list: use string-list API in unsorted_string_list_lookup()	2016-04-25 11:48:27 -07:00
string-list.h	…
submodule-config.c	Merge branch 'rs/submodule-config-code-cleanup' into maint	2016-08-08 14:21:46 -07:00
submodule-config.h	Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init	2016-04-14 12:47:45 -07:00
submodule.c	Merge branch 'jk/submodule-c-credential'	2016-05-17 14:38:25 -07:00
submodule.h	Merge branch 'jk/submodule-c-credential'	2016-05-17 14:38:25 -07:00
symlinks.c	…
tag.c	verify-tag: move tag verification code to tag.c	2016-04-22 14:06:46 -07:00
tag.h	verify-tag: move tag verification code to tag.c	2016-04-22 14:06:46 -07:00
tar.h	…
tempfile.c	mingw: ensure temporary file handles are not inherited by child processes	2016-08-23 09:09:55 -07:00
tempfile.h	mingw: ensure temporary file handles are not inherited by child processes	2016-08-23 09:09:55 -07:00
thread-utils.c	thread-utils.c: detect CPU count on older BSD-like systems	2015-03-10 15:13:28 -07:00
thread-utils.h	…
trace.c	trace: use strbuf for quote_crnl output	2015-09-25 10:18:18 -07:00
trace.h	pkt-line: support tracing verbatim pack contents	2015-06-16 13:24:22 -07:00
trailer.c	trailer.c: mark strings for translation	2016-02-29 14:27:58 -08:00
trailer.h	interpret-trailers: add option for in-place editing	2016-01-14 12:22:17 -08:00
transport-helper.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
transport.c	Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint	2016-09-08 21:36:00 -07:00
transport.h	connect & http: support -4 and -6 switches for remote operations	2016-02-12 11:34:14 -08:00
tree-diff.c	Merge branch 'jk/avoid-unbounded-alloca' into maint	2016-07-06 13:06:39 -07:00
tree-walk.c	tree-walk: convert tree_entry_extract() to use struct object_id	2016-04-25 14:26:28 -07:00
tree-walk.h	tree-walk: convert tree_entry_extract() to use struct object_id	2016-04-25 14:26:28 -07:00
tree.c	struct name_entry: use struct object_id instead of unsigned char sha1[20]	2016-04-25 14:23:42 -07:00
tree.h	Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint	2015-06-25 11:02:10 -07:00
unicode_width.h	…
unimplemented.sh	unimplemented.sh: use the $( ... ) construct for command substitution	2015-12-27 15:33:13 -08:00
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	unpack-trees: fix English grammar in do-this-before-that messages	2016-06-27 08:29:36 -07:00
unpack-trees.h	…
update_unicode.sh	…
upload-pack.c	Merge branch 'jk/common-main' into maint	2016-09-08 21:35:51 -07:00
url.c	use strbuf_complete to conditionally append slash	2015-10-05 11:08:06 -07:00
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	usage.c: add warning_errno() and error_errno()	2016-05-09 12:29:08 -07:00
userdiff.c	userdiff: add support for Fountain documents	2015-07-23 14:44:51 -07:00
userdiff.h	diff: clarify textconv interface	2016-02-22 10:40:35 -08:00
utf8.c	utf8: add function to align a string into given strbuf	2015-09-17 10:02:48 -07:00
utf8.h	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	versionsort: support reorder prerelease suffixes	2015-02-27 13:38:22 -08:00
walker.c	struct name_entry: use struct object_id instead of unsigned char sha1[20]	2016-04-25 14:23:42 -07:00
walker.h	…
wildmatch.c	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
wildmatch.h	…
worktree.c	worktree: use strbuf_add_absolute_path() directly	2016-07-12 15:11:01 -07:00
worktree.h	branch: do not rename a branch under bisect or rebase	2016-04-22 14:09:39 -07:00
wrap-for-bin.sh	wrap-for-bin.sh: regenerate bin-wrappers when switching branches	2016-05-10 13:23:34 -07:00
wrapper.c	Merge branch 'sb/submodule-parallel-fetch' into maint	2016-07-28 11:26:02 -07:00
write_or_die.c	write_or_die: remove the unused write_or_whine() function	2016-06-10 10:54:27 -07:00
ws.c	…
wt-status.c	Merge branch 'mm/status-suggest-merge-abort' into maint	2016-08-10 11:55:19 -07:00
wt-status.h	wt-status.c: split bisect detection out of wt_status_get_state()	2016-04-22 14:09:39 -07:00
xdiff-interface.c	xdiff: don't trim common tail with -W	2016-05-31 13:08:56 -07:00
xdiff-interface.h	xdiff: reject files larger than ~1GB	2015-09-28 14:57:23 -07:00
zlib.c	zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}	2015-03-05 15:46:03 -08:00

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 http://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-.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 http://news.gmane.org/gmane.comp.version-control.git/, http://marc.info/?l=git and other archival sites.

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