Go to file

Stefan Beller e6e045f803 diff.c: buffer all output if asked to Introduce a new option 'emitted_symbols' in the struct diff_options which controls whether all output is buffered up until all output is available. It is set internally in diff.c when necessary. We'll have a new struct 'emitted_string' in diff.c which will be used to buffer each line. The emitted_string will duplicate the memory of the line to buffer as that is easiest to reason about for now. In a future patch we may want to decrease the memory usage by not duplicating all output for buffering but rather we may want to store offsets into the file or in case of hunk descriptions such as the similarity score, we could just store the relevant number and reproduce the text later on. This approach was chosen as a first step because it is quite simple compared to the alternative with less memory footprint. emit_diff_symbol factors out the emission part and depending on the diff_options->emitted_symbols the emission will be performed directly when calling emit_diff_symbol or after the whole process is done, i.e. by buffering we have add the possibility for a second pass over the whole output before doing the actual output. In `6440d34` (2012-03-14, diff: tweak a _copy_ of diff_options with word-diff) we introduced a duplicate diff options struct for word emissions as we may have different regex settings in there. When buffering the output, we need to operate on just one buffer, so we have to copy back the emissions of the word buffer into the main buffer. Unconditionally enable output via buffer in this patch as it yields a great opportunity for testing, i.e. all the diff tests from the test suite pass without having reordering issues (i.e. only parts of the output got buffered, and we forgot to buffer other parts). The test suite passes, which gives confidence that we converted all functions to use emit_string for output. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2017-06-30 13:13:02 -07:00
.github	Configure Git contribution guidelines for github.com	2017-06-13 08:41:47 -07:00
Documentation	hashmap: migrate documentation from Documentation/technical into header	2017-06-30 13:11:59 -07:00
block-sha1	…
builtin	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
ci	Merge branch 'ls/travis-doc-asciidoctor' into maint	2017-06-05 09:03:10 +09:00
compat	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
contrib	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
ewah	…
git-gui	Fix build with core.autocrlf=true	2017-05-10 13:32:50 +09:00
gitk-git	…
gitweb	doc: use https links to Wikipedia to avoid http redirects	2017-05-15 13:04:54 +09:00
mergetools	mergetools/meld: improve compatibiilty with Meld on macOS X	2017-06-18 22:11:29 -07:00
perl	…
po	Merge branch 'master' of git://github.com/nafmo/git-l10n-sv	2017-05-09 22:12:34 +08:00
ppc	…
refs	Merge branch 'mh/packed-ref-store-prep'	2017-06-26 14:09:29 -07:00
sha1dc	sha1dc: update from upstream	2017-06-07 09:25:20 +09:00
t	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
templates	…
vcs-svn	timestamp_t: a new data type for timestamps	2017-04-27 13:07:39 +09:00
xdiff	…
.gitattributes	Fix build with core.autocrlf=true	2017-05-10 13:32:50 +09:00
.gitignore	…
.mailmap	…
.travis.yml	Merge branch 'ls/travis-doc-asciidoctor' into maint	2017-06-05 09:03:10 +09:00
COPYING	…
GIT-VERSION-GEN	Git 2.13.2	2017-06-24 15:31:36 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'nd/fopen-errors'	2017-06-22 14:15:20 -07:00
README.md	…
RelNotes	Prepare for 2.13.2	2017-06-13 13:30:16 -07:00
abspath.c	…
aclocal.m4	…
advice.c	Merge branch 'jk/warn-add-gitlink'	2017-06-24 14:28:41 -07:00
advice.h	add: warn when adding an embedded repository	2017-06-15 09:10:44 -07:00
alias.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
alloc.c	…
apply.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
apply.h	…
archive-tar.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
archive-zip.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
archive.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
archive.h	timestamp_t: a new data type for timestamps	2017-04-27 13:07:39 +09:00
argv-array.c	…
argv-array.h	…
attr.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
attr.h	…
base85.c	…
bisect.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
bisect.h	…
blame.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
blame.h	blame: move entry prepend to libgit	2017-05-25 13:08:23 +09:00
blob.c	Convert lookup_blob to struct object_id	2017-05-08 15:12:57 +09:00
blob.h	Convert lookup_blob to struct object_id	2017-05-08 15:12:57 +09:00
branch.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
branch.h	…
builtin.h	blame: move textconv_object with related functions	2017-05-24 15:41:50 +09:00
bulk-checkin.c	pack: convert struct pack_idx_entry to struct object_id	2017-05-08 15:12:57 +09:00
bulk-checkin.h	…
bundle.c	Merge branch 'bc/object-id'	2017-05-29 12:34:43 +09:00
bundle.h	bundle: convert to struct object_id	2017-05-02 10:46:41 +09:00
cache-tree.c	Merge branch 'bc/object-id'	2017-05-29 12:34:43 +09:00
cache-tree.h	Convert struct cache_tree to use struct object_id	2017-05-02 10:46:41 +09:00
cache.h	diff.c: migrate emit_line_checked to use emit_diff_symbol	2017-06-30 13:13:01 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
color.h	…
column.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
column.h	…
combine-diff.c	Merge branch 'bw/ls-files-sans-the-index'	2017-06-24 14:28:40 -07:00
command-list.txt	…
commit-slab.h	*.[ch] refactoring: make use of the FREE_AND_NULL() macro	2017-06-16 12:44:09 -07:00
commit.c	coccinelle: make use of the "type" FREE_AND_NULL() rule	2017-06-16 12:44:03 -07:00
commit.h	Merge branch 'bc/object-id'	2017-05-29 12:34:43 +09:00
common-main.c	…
config.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
config.h	config: don't implicitly use gitdir or commondir	2017-06-15 12:56:22 -07:00
config.mak.in	…
config.mak.uname	Merge branch 'ab/pcre-v2'	2017-06-19 12:38:43 -07:00
configure.ac	Merge branch 'nd/fopen-errors'	2017-06-22 14:15:20 -07:00
connect.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
connect.h	…
connected.c	…
connected.h	…
convert.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
convert.h	convert: convert renormalize_buffer to take an index	2017-06-13 11:40:51 -07:00
copy.c	…
credential-cache--daemon.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
credential-cache.c	Merge branch 'nd/conditional-config-include'	2017-04-23 22:07:46 -07:00
credential-store.c	path.c: and an option to call real_path() in expand_user_path()	2017-04-14 23:51:38 -07:00
credential.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
date.c	Merge branch 'rs/strbuf-addftime-zZ'	2017-06-22 14:15:25 -07:00
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
diff-no-index.c	diff: convert fill_filespec to struct object_id	2017-06-02 09:36:07 +09:00
diff.c	diff.c: buffer all output if asked to	2017-06-30 13:13:02 -07:00
diff.h	diff.c: buffer all output if asked to	2017-06-30 13:13:02 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	Merge branch 'js/regexec-buf' into maint	2017-03-28 13:52:24 -07:00
diffcore-rename.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
diffcore.h	diff: convert fill_filespec to struct object_id	2017-06-02 09:36:07 +09:00
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
dir.h	Merge branch 'pc/dir-count-slashes'	2017-06-22 14:15:21 -07:00
editor.c	…
entry.c	entry.c: submodule recursing: respect force flag correctly	2017-04-18 21:18:29 -07:00
environment.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
fetch-pack.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
fetch-pack.h	Rename sha1_array to oid_array	2017-03-31 08:33:56 -07:00
fmt-merge-msg.h	…
fsck.c	Merge branch 'bc/object-id'	2017-05-29 12:34:43 +09:00
fsck.h	Rename sha1_array to oid_array	2017-03-31 08:33:56 -07:00
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	Merge branch 'jk/add-p-commentchar-fix'	2017-06-26 14:09:31 -07:00
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL	2017-06-15 14:56:39 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	filter-branch: add [--] to usage	2017-06-12 09:49:52 -07:00
git-instaweb.sh	…
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: don't use name-rev to get current branch	2017-04-16 21:13:26 -07:00
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	doc: replace more gmane links	2017-05-09 21:13:13 -07:00
git-rebase--merge.sh	…
git-rebase.sh	Merge branch 'gb/rebase-signoff'	2017-04-26 15:39:02 +09:00
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'jt/send-email-validate-hook'	2017-06-02 15:06:00 +09:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	Merge branch 'lb/status-stash-count'	2017-06-26 14:09:29 -07:00
git-submodule.sh	add: warn when adding an embedded repository	2017-06-15 09:10:44 -07:00
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
git.rc	…
gpg-interface.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
gpg-interface.h	…
graph.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
graph.h	…
grep.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
grep.h	Merge branch 'bw/object-id'	2017-06-19 12:38:44 -07:00
hash.h	…
hashmap.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
hashmap.h	hashmap: migrate documentation from Documentation/technical into header	2017-06-30 13:11:59 -07:00
help.c	Merge branch 'mb/reword-autocomplete-message'	2017-06-26 14:09:33 -07:00
help.h	…
hex.c	…
http-backend.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
http-fetch.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
http-push.c	coccinelle: make use of the "type" FREE_AND_NULL() rule	2017-06-16 12:44:03 -07:00
http-walker.c	Merge branch 'ew/http-alternates-as-redirects-warning' into maint	2017-03-28 13:52:23 -07:00
http.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
http.h	http.postbuffer: allow full range of ssize_t values	2017-04-13 18:24:32 -07:00
ident.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
imap-send.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
iterator.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
list-objects.c	Convert lookup_tree to struct object_id	2017-05-08 15:12:57 +09:00
list-objects.h	…
list.h	…
ll-merge.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
ll-merge.h	…
lockfile.c	…
lockfile.h	lockfile: add a new method, is_lock_file_locked()	2017-05-23 14:29:54 +09:00
log-tree.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
log-tree.h	…
mailinfo.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
merge-recursive.h	…
merge.c	tree: convert parse_tree_indirect to struct object_id	2017-05-08 15:12:58 +09:00
mergesort.c	…
mergesort.h	…
mru.c	…
mru.h	…
name-hash.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
notes-cache.c	notes: convert some accessor functions to struct object_id	2017-06-02 09:36:06 +09:00
notes-cache.h	notes-cache: convert to struct object_id	2017-05-08 15:12:57 +09:00
notes-merge.c	diff-tree: convert diff_tree_sha1 to struct object_id	2017-06-05 11:23:58 +09:00
notes-merge.h	notes-merge: convert notes_merge* to struct object_id	2017-06-05 11:23:58 +09:00
notes-utils.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
notes-utils.h	builtin/notes: convert to struct object_id	2017-06-02 09:36:06 +09:00
notes.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
notes.h	notes: convert some accessor functions to struct object_id	2017-06-02 09:36:06 +09:00
object.c	coccinelle: make use of the "type" FREE_AND_NULL() rule	2017-06-16 12:44:03 -07:00
object.h	object: convert parse_object* to take struct object_id	2017-05-08 15:12:58 +09:00
oidset.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
oidset.h	…
pack-bitmap-write.c	pack: convert struct pack_idx_entry to struct object_id	2017-05-08 15:12:57 +09:00
pack-bitmap.c	object: convert parse_object* to take struct object_id	2017-05-08 15:12:58 +09:00
pack-bitmap.h	…
pack-check.c	Convert the verify_pack callback to struct object_id	2017-05-08 15:12:57 +09:00
pack-objects.c	pack: convert struct pack_idx_entry to struct object_id	2017-05-08 15:12:57 +09:00
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	pack: convert struct pack_idx_entry to struct object_id	2017-05-08 15:12:57 +09:00
pack.h	Convert the verify_pack callback to struct object_id	2017-05-08 15:12:57 +09:00
pager.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
parse-options-cb.c	Merge branch 'bc/object-id'	2017-05-29 12:34:43 +09:00
parse-options.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
parse-options.h	…
patch-delta.c	…
patch-ids.c	patch-ids.c: use hashmap correctly	2017-06-30 13:11:54 -07:00
patch-ids.h	patch-ids: convert to struct object_id	2017-06-02 09:36:07 +09:00
path.c	Merge branch 'nd/conditional-config-include'	2017-04-23 22:07:46 -07:00
pathspec.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
pathspec.h	pathspec: convert find_pathspecs_matching_against_index to take an index	2017-05-12 14:23:46 +09:00
pkt-line.c	convert: move packet_write_line() into pkt-line as packet_writel()	2017-05-08 10:57:26 +09:00
pkt-line.h	pkt-line: annotate packet_writel with LAST_ARG_MUST_BE_NULL	2017-05-15 13:01:36 +09:00
preload-index.c	…
pretty.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
prio-queue.c	*.[ch] refactoring: make use of the FREE_AND_NULL() macro	2017-06-16 12:44:09 -07:00
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
prompt.h	…
quote.c	…
quote.h	…
reachable.c	Merge branch 'bc/object-id'	2017-05-29 12:34:43 +09:00
reachable.h	timestamp_t: a new data type for timestamps	2017-04-27 13:07:39 +09:00
read-cache.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
ref-filter.c	coccinelle: make use of the "type" FREE_AND_NULL() rule	2017-06-16 12:44:03 -07:00
ref-filter.h	Convert struct ref_array_item to struct object_id	2017-05-08 15:12:57 +09:00
reflog-walk.c	Merge branch 'js/plug-leaks'	2017-05-29 12:34:44 +09:00
reflog-walk.h	…
refs.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
refs.h	for_each_bisect_ref(): don't trim refnames	2017-06-18 22:13:42 -07:00
remote-curl.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
remote-testsvn.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
remote.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
remote.h	Merge branch 'bw/push-options-recursively-to-submodules'	2017-04-19 21:37:14 -07:00
replace_object.c	…
rerere.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'mh/packed-ref-store-prep'	2017-06-26 14:09:29 -07:00
revision.h	Merge branch 'sg/revision-parser-skip-prefix' into maint	2017-06-24 15:29:34 -07:00
run-command.c	run-command: restrict PATH search to executable files	2017-04-25 23:17:36 -07:00
run-command.h	run-command: expose is_executable function	2017-04-25 18:45:29 -07:00
send-pack.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
send-pack.h	Rename sha1_array to oid_array	2017-03-31 08:33:56 -07:00
sequencer.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
sequencer.h	…
server-info.c	Merge branch 'nd/fopen-errors'	2017-06-13 13:47:09 -07:00
setup.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
sh-i18n--envsubst.c	…
sha1-array.c	coccinelle: make use of the "type" FREE_AND_NULL() rule	2017-06-16 12:44:03 -07:00
sha1-array.h	Rename sha1_array to oid_array	2017-03-31 08:33:56 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
sha1_name.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
sha1dc_git.c	sha1dc: update from upstream	2017-05-22 10:20:46 +09:00
sha1dc_git.h	sha1dc: update from upstream	2017-05-22 10:20:46 +09:00
shallow.c	Merge branch 'js/plug-leaks'	2017-05-29 12:34:44 +09:00
shell.c	Merge branch 'maint-2.8' into maint-2.9	2017-05-05 13:13:48 +09:00
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
split-index.h	Revert "split-index: add and use unshare_split_index()"	2017-06-24 12:02:39 -07:00
strbuf.c	Merge branch 'rs/pretty-add-again'	2017-06-24 14:28:38 -07:00
strbuf.h	Merge branch 'rs/pretty-add-again'	2017-06-24 14:28:38 -07:00
streaming.c	…
streaming.h	…
string-list.c	Merge branch 'bw/forking-and-threading' into maint	2017-06-13 13:27:00 -07:00
string-list.h	string-list: add string_list_remove function	2017-04-20 17:55:32 -07:00
sub-process.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
sub-process.h	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
submodule-config.c	hashmap.h: compare function has access to a data field	2017-06-30 12:49:28 -07:00
submodule-config.h	…
submodule.c	submodule.c: migrate diff output to use emit_diff_symbol	2017-06-30 13:13:02 -07:00
submodule.h	submodule.c: migrate diff output to use emit_diff_symbol	2017-06-30 13:13:02 -07:00
symlinks.c	…
tag.c	Merge branch 'bc/object-id'	2017-05-29 12:34:43 +09:00
tag.h	Merge branch 'bc/object-id'	2017-05-29 12:34:43 +09:00
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	…
tmp-objdir.h	…
trace.c	…
trace.h	…
trailer.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
trailer.h	…
transport-helper.c	coccinelle: make use of the "type" FREE_AND_NULL() rule	2017-06-16 12:44:03 -07:00
transport.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
transport.h	…
tree-diff.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
tree-walk.c	Merge branch 'jk/diff-blob' into maint	2017-06-24 15:29:28 -07:00
tree-walk.h	…
tree.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
tree.h	tree: convert read_tree to take an index parameter	2017-06-13 11:40:51 -07:00
unicode_width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
unpack-trees.h	…
upload-pack.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	Merge branch 'bw/forking-and-threading' into maint	2017-06-13 13:27:00 -07:00
userdiff.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
walker.c	object: convert parse_object* to take struct object_id	2017-05-08 15:12:58 +09:00
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	Merge branch 'js/plug-leaks'	2017-05-29 12:34:44 +09:00
worktree.h	worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()	2017-04-24 21:28:55 -07:00
wrap-for-bin.sh	…
wrapper.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
write_or_die.c	…
ws.c	…
wt-status.c	status: add optional stash count information	2017-06-18 22:17:47 -07:00
wt-status.h	status: add optional stash count information	2017-06-18 22:17:47 -07:00
xdiff-interface.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07: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-.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://public-inbox.org/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