A fork of Git containing Microsoft-specific patches.

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

David Aguilar 08221e3fa2 mergetool: move main program flow into a main() function Make it easier to follow the program's flow by isolating all logic into functions. Isolate the main execution code path into a single unit instead of having prompt_after_failed_merge() interrupt it partyway through. The use of a main() function is borrowing a convention from C, Python, Perl, and many other languages. This helps readers more familiar with other languages understand the purpose of each function when diving into the codebase with fresh eyes. Signed-off-by: David Aguilar <davvid@gmail.com> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2016-10-11 10:04:23 -07:00
Documentation	Eighth batch for 2.11	2016-10-06 14:55:18 -07:00
block-sha1	…
builtin	Merge branch 'rs/cocci'	2016-10-06 14:53:12 -07:00
ci	travis-ci: build documentation	2016-05-10 11:19:07 -07:00
compat	Merge branch 'rs/compat-strdup' into maint	2016-09-19 13:51:42 -07:00
contrib	Merge branch 'rs/cocci'	2016-10-06 14:53:12 -07:00
ewah	ewah: convert to REALLOC_ARRAY, etc	2016-02-22 14:51:09 -08:00
git-gui	Merge branch 'va/git-gui-i18n'	2016-10-03 13:30:37 -07:00
gitk-git	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	2016-03-20 18:05:10 -07:00
gitweb	gitweb: use highlight's shebang detection	2016-09-25 16:39:11 -07:00
mergetools	mergetools: add support for ExamDiff	2016-04-04 09:15:14 -07:00
perl	git-svn: warn instead of dying when commit data is missing	2016-07-09 22:53:54 +00:00
po	git-gui: l10n: add Portuguese translation	2016-09-26 07:18:33 -07:00
ppc	…
refs	Merge branch 'mh/ref-store'	2016-09-19 13:47:19 -07:00
t	Merge branch 'rs/c-auto-resets-attributes'	2016-10-06 14:53:12 -07:00
templates	push options: {pre,post}-receive hook learns about push options	2016-07-14 15:50:17 -07:00
vcs-svn	Merge branch 'mr/vcs-svn-printf-ulong' into maint	2016-09-29 16:49:37 -07:00
xdiff	Merge branch 'mh/diff-indent-heuristic'	2016-10-03 13:30:38 -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	add David Turner's Two Sigma address	2016-09-26 17:46:44 -07:00
.travis.yml	Merge branch 'ls/travis-homebrew-path-fix' into maint	2016-09-29 16:49:45 -07:00
COPYING	…
GIT-VERSION-GEN	Git 2.10.1	2016-10-03 13:24:18 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'js/regexec-buf' into maint	2016-09-29 16:49:45 -07:00
README.md	README.md: format CLI commands with code syntax	2016-05-31 08:54:24 -07:00
RelNotes	Start preparing for 2.10.1	2016-09-19 13:54:50 -07:00
abspath.c	Windows: shorten code by re-using convert_slashes()	2016-04-04 18:03:02 -07:00
aclocal.m4	…
advice.c	i18n: advice: internationalize message for conflicts	2016-06-17 15:45:48 -07:00
advice.h	…
alias.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
alloc.c	…
apply.c	introduce CHECKOUT_INIT	2016-09-22 13:42:18 -07:00
apply.h	apply: learn to use a different index file	2016-09-07 12:29:54 -07:00
archive-tar.c	Merge branch 'jk/big-and-future-archive-tar'	2016-08-12 09:47:37 -07:00
archive-zip.c	…
archive.c	i18n: archive: mark errors for translation	2016-08-09 12:44:59 -07: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/printf-format'	2016-07-19 13:22:22 -07:00
bisect.h	…
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	builtin: convert textconv_object to use struct object_id	2016-09-07 12:59:42 -07:00
bulk-checkin.c	…
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: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
cache-tree.h	…
cache.h	Merge branch 'jk/ambiguous-short-object-names'	2016-10-06 14:53:10 -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	Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maint	2016-09-19 13:51:41 -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	Merge branch 'bc/cocci'	2016-07-19 13:22:16 -07:00
command-list.txt	…
commit-slab.h	Merge branch 'vs/typofix'	2016-08-12 09:47:37 -07:00
commit.c	Merge branch 'rs/copy-array'	2016-10-03 13:30:33 -07:00
commit.h	Merge branch 'rs/pull-signed-tag'	2016-08-19 15:34:14 -07:00
common-main.c	mingw: declare main()'s argv as const	2016-07-06 08:11:47 -07:00
config.c	get_short_sha1: make default disambiguation configurable	2016-09-27 10:29:56 -07:00
config.mak.in	…
config.mak.uname	Merge branch 'ew/build-time-pager-tweaks'	2016-08-08 14:48:44 -07:00
configure.ac	Merge branch 'ew/autoconf-pthread' into maint	2016-08-10 11:55:21 -07:00
connect.c	Merge branch 'va/i18n-more'	2016-09-26 16:09:18 -07:00
connect.h	connect & http: support -4 and -6 switches for remote operations	2016-02-12 11:34:14 -08:00
connected.c	check_connected: add progress flag	2016-07-20 12:11:09 -07:00
connected.h	check_connected: add progress flag	2016-07-20 12:11:09 -07:00
convert.c	convert: Correct NNO tests and missing `LF will be replaced by CRLF`	2016-08-14 13:45:52 -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	…
csum-file.h	…
ctype.c	…
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	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	cache: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
diff-no-index.c	Merge branch 'jk/setup-sequence-update'	2016-09-21 15:15:24 -07:00
diff.c	Merge branch 'rs/cocci'	2016-10-06 14:53:12 -07:00
diff.h	Merge branch 'mh/diff-indent-heuristic'	2016-09-26 16:09:16 -07:00
diffcore-break.c	diff: rename struct diff_filespec's sha1_valid member	2016-06-28 11:39:02 -07:00
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	Merge branch 'js/regexec-buf' into maint	2016-09-29 16:49:45 -07:00
diffcore-rename.c	pass constants as first argument to st_mult()	2016-08-01 14:01:03 -07:00
diffcore.h	diff: rename struct diff_filespec's sha1_valid member	2016-06-28 11:39:02 -07:00
dir-iterator.c	dir_iterator: new API for iterating over a directory tree	2016-06-20 11:38:21 -07:00
dir-iterator.h	dir_iterator: new API for iterating over a directory tree	2016-06-20 11:38:21 -07:00
dir.c	cache: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
dir.h	Merge branch 'mh/split-under-lock'	2016-07-25 14:13:32 -07:00
editor.c	editor.c: use error_errno()	2016-05-09 12:29:08 -07:00
entry.c	streaming: make stream_blob_to_fd take struct object_id	2016-09-07 12:59:42 -07:00
environment.c	Merge branch 'jk/setup-sequence-update'	2016-09-21 15:15:24 -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'	2016-07-19 13:22:19 -07:00
fetch-pack.c	fetch-pack: do not reset in_vain on non-novel acks	2016-09-23 12:37:45 -07:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	fsck: handle bad trees like other errors	2016-09-27 14:09:10 -07:00
fsck.h	fsck: give the error function a chance to see the fsck_options	2016-07-18 11:35:00 -07:00
generate-cmdlist.sh	…
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	diff: improve positioning of add/delete blocks in diffs	2016-09-19 10:25:11 -07:00
git-archimport.perl	…
git-bisect.sh	i18n: unmark die messages for translation	2016-06-17 15:46:10 -07:00
git-compat-util.h	Merge branch 'rs/copy-array'	2016-10-03 13:30:33 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
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: use Git::* functions instead of passing around state	2016-07-28 14:01:55 -07: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-merge-octopus.sh	git-merge-octopus: do not capitalize "octopus"	2016-09-08 12:17:10 -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	mergetool: move main program flow into a main() function	2016-10-11 10:04:23 -07:00
git-p4.py	Spelling fixes	2016-08-11 14:35:42 -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-rebase--am.sh	rebase: update comment about FreeBSD /bin/sh	2016-06-17 11:04:38 -07:00
git-rebase--interactive.sh	Merge branch 'rt/rebase-i-broken-insn-advise' into maint	2016-09-29 16:49:46 -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	i18n: git-sh-setup.sh: mark strings for translation	2016-06-17 15:45:48 -07:00
git-relink.perl	…
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'jc/send-email-skip-backup'	2016-07-11 10:31:04 -07:00
git-sh-i18n.sh	i18n: rebase-interactive: mark here-doc strings for translation	2016-06-17 15:45:48 -07:00
git-sh-setup.sh	Merge branch 'ew/build-time-pager-tweaks'	2016-08-08 14:48:44 -07:00
git-stash.sh	i18n: stash: mark messages for translation	2016-09-21 10:20:43 -07:00
git-submodule.sh	clone: pass --progress decision to recursive submodules	2016-09-22 11:22:47 -07:00
git-svn.perl	git-svn: allow --version to work anywhere	2016-07-22 20:38:11 +00:00
git-web--browse.sh	…
git.c	Merge branch 'jk/setup-sequence-update'	2016-09-21 15:15:24 -07:00
git.rc	…
gpg-interface.c	Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/gpg-show-long-key-in-signature-verification	2016-08-16 15:04:13 -07:00
gpg-interface.h	…
graph.c	Merge branch 'jk/graph-padding-fix'	2016-10-06 14:53:11 -07:00
graph.h	graph: add support for --line-prefix on all graph-aware output	2016-08-31 18:07:09 -07:00
grep.c	Merge branch 'js/regexec-buf' into maint	2016-09-29 16:49:45 -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	Merge branch 'rs/hex2chr' into maint	2016-09-19 13:51:43 -07:00
http-backend.c	Merge branch 'ew/http-backend-batch-headers'	2016-08-12 09:47:38 -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: reduce O(n) ops with doubly-linked list	2016-07-12 15:17:42 -07:00
http.c	Merge branch 'ps/http-gssapi-cred-delegation'	2016-10-06 14:53:11 -07:00
http.h	Merge branch 'ep/http-curl-trace'	2016-07-06 13:38:06 -07:00
ident.c	Merge branch 'jk/ident-ai-canonname-could-be-null' into maint	2016-10-03 13:22:32 -07:00
imap-send.c	die("bug"): report bugs consistently	2016-07-26 11:13:44 -07:00
iterator.h	refs: introduce an iterator interface	2016-06-20 11:38:20 -07:00
khash.h	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
kwset.c	…
kwset.h	…
levenshtein.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
levenshtein.h	…
line-log.c	Merge branch 'bc/cocci'	2016-07-19 13:22:16 -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
list.h	list: avoid incompatibility with *BSD sys/queue.h	2016-07-18 11:06:51 -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	graph: add support for --line-prefix on all graph-aware output	2016-08-31 18:07:09 -07:00
log-tree.h	…
mailinfo.c	Merge branch 'kd/mailinfo-quoted-string'	2016-10-03 13:30:38 -07:00
mailinfo.h	mailinfo: handle in-body header continuations	2016-09-21 10:23:11 -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/cocci'	2016-09-26 16:09:14 -07:00
merge-recursive.h	merge-recursive: offer an option to retain the output in 'obuf'	2016-08-01 11:45:30 -07:00
merge.c	sequencer: lib'ify checkout_fast_forward()	2016-09-09 11:24:52 -07:00
mergesort.c	…
mergesort.h	…
mru.c	add generic most-recently-used list	2016-07-29 11:05:07 -07:00
mru.h	add generic most-recently-used list	2016-07-29 11:05:07 -07:00
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	Merge branch 'va/i18n-more'	2016-09-26 16:09:18 -07:00
notes-merge.h	…
notes-utils.c	notes: allow treeish expressions as notes ref	2016-01-12 15:10:01 -08:00
notes-utils.h	…
notes.c	notes: convert init_notes to use struct object_id	2016-09-07 12:59:42 -07:00
notes.h	Merge branch 'jk/notes-merge-from-anywhere'	2016-02-03 14:15:59 -08:00
object.c	…
object.h	…
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	Merge branch 'jk/verify-packfile-gently'	2016-09-29 16:57:13 -07:00
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	use COPY_ARRAY	2016-09-25 16:44:13 -07:00
pack-revindex.h	…
pack-write.c	sha1_file: drop free_pack_by_name	2016-07-29 11:05:06 -07:00
pack.h	fsck: use streaming interface for large blobs in pack	2016-07-13 09:15:29 -07:00
pager.c	Merge branch 'jk/setup-sequence-update'	2016-09-21 15:15:24 -07:00
parse-options-cb.c	Merge branch 'mh/diff-indent-heuristic'	2016-09-26 16:09:16 -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	Merge branch 'mh/diff-indent-heuristic'	2016-09-26 16:09:16 -07:00
patch-delta.c	…
patch-ids.c	patch-ids: refuse to compute patch-id for merge commit	2016-09-12 13:45:01 -07:00
patch-ids.h	rebase: avoid computing unnecessary patch IDs	2016-08-11 14:39:16 -07:00
path.c	Merge branch 'jk/diff-submodule-diff-inline'	2016-09-12 15:34:31 -07:00
pathspec.c	use COPY_ARRAY	2016-09-25 16:44:13 -07:00
pathspec.h	Merge branch 'bw/pathspec-remove-unused-extern-decl' into maint	2016-09-29 16:49:34 -07:00
pkt-line.c	introduce hex2chr() for converting two hexadecimal digits to a character	2016-09-07 10:42:46 -07:00
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'rs/c-auto-resets-attributes'	2016-10-06 14:53:12 -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 'tg/add-chmod+x-fix' into maint	2016-09-29 16:49:47 -07:00
ref-filter.c	ref-filter: strip format option after a field name only once while parsing	2016-10-03 12:47:19 -07:00
ref-filter.h	…
reflog-walk.c	reflog: continue walking the reflog past root commits	2016-06-06 15:06:44 -07:00
reflog-walk.h	…
refs.c	Merge branch 'bc/object-id'	2016-09-19 13:47:19 -07:00
refs.h	Merge branch 'bc/object-id'	2016-09-19 13:47:19 -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	use strbuf_addstr() for adding constant strings to a strbuf, part 2	2016-09-15 12:23:38 -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	…
rerere.c	cache: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
rerere.h	Merge branch 'jc/rerere-multi'	2016-04-25 15:17:15 -07:00
resolve-undo.c	cache: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
resolve-undo.h	…
revision.c	Merge branch 'vn/revision-shorthand-for-side-branch-log'	2016-10-06 14:53:10 -07:00
revision.h	Merge branch 'lt/pretty-expand-tabs'	2016-04-13 14:12:36 -07:00
run-command.c	Merge branch 'ab/hooks'	2016-08-19 15:34:16 -07:00
run-command.h	run-command: add pipe_command helper	2016-06-17 17:03:56 -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: accept push options	2016-07-14 15:50:41 -07:00
sequencer.c	sequencer: ensure to release the lock when we could not read the index	2016-09-09 11:24:52 -07:00
sequencer.h	…
server-info.c	server-info.c: use error_errno()	2016-05-09 12:29:08 -07:00
setup.c	i18n: setup: mark error messages for translation	2016-08-09 12:44:59 -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: let callbacks interrupt iteration	2016-09-26 11:46:41 -07:00
sha1-array.h	sha1_array: let callbacks interrupt iteration	2016-09-26 11:46:41 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'jc/verify-loose-object-header'	2016-10-03 13:30:36 -07:00
sha1_name.c	get_short_sha1: make default disambiguation configurable	2016-09-27 10:29:56 -07:00
shallow.c	pass constants as first argument to st_mult()	2016-08-01 14:01:03 -07:00
shell.c	common-main: call git_setup_gettext()	2016-07-01 15:09:10 -07:00
shortlog.h	shortlog: support outputting to streams other than stdout	2016-06-24 14:25:49 -07:00
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.h	…
split-index.c	use COPY_ARRAY	2016-09-25 16:44:13 -07:00
split-index.h	…
strbuf.c	Merge branch 'rs/strbuf-remove-fix' into maint	2016-09-29 16:49:35 -07:00
strbuf.h	Merge branch 'rs/use-strbuf-addbuf' into maint	2016-08-08 14:21:42 -07:00
streaming.c	Merge branch 'jc/verify-loose-object-header'	2016-10-03 13:30:36 -07:00
streaming.h	streaming: make stream_blob_to_fd take struct object_id	2016-09-07 12:59:42 -07:00
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 'sb/submodule-update-dot-branch'	2016-08-10 12:33:20 -07:00
submodule-config.h	submodule-config: keep configured branch around	2016-08-01 14:42:07 -07:00
submodule.c	Merge branch 'rs/cocci'	2016-10-06 14:53:12 -07:00
submodule.h	diff: teach diff to display submodule difference with an inline diff	2016-08-31 18:07:10 -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.h	…
trace.c	trace: do not fall back to stderr	2016-08-05 09:28:17 -07:00
trace.h	…
trailer.c	die("bug"): report bugs consistently	2016-07-26 11:13:44 -07:00
trailer.h	interpret-trailers: add option for in-place editing	2016-01-14 12:22:17 -08:00
transport-helper.c	Spelling fixes	2016-08-11 14:35:42 -07:00
transport.c	Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint	2016-09-08 21:36:00 -07:00
transport.h	push: accept push options	2016-07-14 15:50:41 -07:00
tree-diff.c	Merge branch 'jk/avoid-unbounded-alloca' into maint	2016-07-06 13:06:39 -07:00
tree-walk.c	fsck: handle bad trees like other errors	2016-09-27 14:09:10 -07:00
tree-walk.h	fsck: handle bad trees like other errors	2016-09-27 14:09:10 -07:00
tree.c	cache: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
tree.h	…
unicode_width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maint	2016-09-29 16:49: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	introduce hex2chr() for converting two hexadecimal digits to a character	2016-09-07 10:42:46 -07:00
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	Merge branch 'cc/apply-am'	2016-09-19 13:47:18 -07:00
userdiff.c	userdiff: add built-in pattern for CSS	2016-06-03 14:45:56 -07:00
userdiff.h	diff: clarify textconv interface	2016-02-22 10:40:35 -08:00
utf8.c	…
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	…
walker.c	walker: let walker_say take arbitrary formats	2016-07-08 10:11:23 -07:00
walker.h	walker: let walker_say take arbitrary formats	2016-07-08 10:11:23 -07:00
wildmatch.c	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
wildmatch.h	…
worktree.c	Merge branch 'nd/worktree-lock'	2016-07-28 10:34:42 -07:00
worktree.h	worktree.c: add is_worktree_locked()	2016-06-13 11:53:14 -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: drop write_or_whine_pipe()	2016-08-05 09:28:17 -07:00
ws.c	…
wt-status.c	Merge branch 'rs/cocci'	2016-10-06 14:53:12 -07:00
wt-status.h	status: print branch info with --porcelain=v2 --branch	2016-08-11 11:15:40 -07:00
xdiff-interface.c	Merge branch 'js/regexec-buf' into maint	2016-09-29 16:49:45 -07:00
xdiff-interface.h	Convert read_mmblob to take struct object_id.	2016-09-07 12:59:42 -07:00
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 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