Go to file

Johannes Schindelin 6ea57703f6 log: prepare log/log-tree to reuse the diffopt.close_file attribute We are about to teach the log-tree machinery to reuse the diffopt.file field to output to a file stream other than stdout, in line with the diff machinery already writing to diffopt.file. However, we might want to write something after the diff in log_tree_commit() (e.g. with the --show-linear-break option), therefore we must not let the diff machinery close the file (as per diffopt.close_file. This means that log_tree_commit() itself must override the diffopt.close_file flag and close the file, and if log_tree_commit() is called in a loop, the caller is responsible to do the same. Note: format-patch has an `--output-directory` option. Due to the fact that format-patch's options are parsed first, and that the parse-options machinery accepts uniquely abbreviated options, the diff options `--output` (and `-o`) are shadowed. Therefore close_file is not set to 1 so that cmd_format_patch() does not need to handle the close_file flag differently, even if it calls log_tree_commit() in a loop. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2016-06-24 13:50:45 -07:00
Documentation	Start the post-2.9 cycle	2016-06-20 11:06:49 -07:00
block-sha1	…
builtin	log: prepare log/log-tree to reuse the diffopt.close_file attribute	2016-06-24 13:50:45 -07:00
ci	…
compat	Merge branch 'kb/msys2-tty' into maint	2016-06-06 14:27:38 -07:00
contrib	git-multimail: update to release 1.3.1	2016-05-13 12:54:06 -07:00
ewah	…
git-gui	…
gitk-git	…
gitweb	Merge branch 'sk/gitweb-highlight-encoding' into HEAD	2016-05-18 14:40:10 -07:00
mergetools	…
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	…
refs	…
t	Merge branch 'rs/xdiff-hunk-with-func-line'	2016-06-20 11:01:04 -07:00
templates	…
vcs-svn	…
xdiff	Merge branch 'rs/xdiff-hunk-with-func-line'	2016-06-20 11:01:04 -07:00
.gitattributes	…
.gitignore	…
.mailmap	…
.travis.yml	Merge branch 'ls/travis-build-doc' into maint	2016-05-26 13:17:25 -07:00
COPYING	…
GIT-VERSION-GEN	Start the post-2.9 cycle	2016-06-20 11:06:49 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'mm/makefile-developer-can-be-in-config-mak'	2016-06-03 14:38:02 -07:00
README.md	README.md: format CLI commands with code syntax	2016-05-31 08:54:24 -07:00
RelNotes	Start the post-2.9 cycle	2016-06-20 11:06:49 -07:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
archive-tar.c	archive-tar: convert snprintf to xsnprintf	2016-05-26 10:44:26 -07:00
archive-zip.c	…
archive.c	pathspec: rename free_pathspec() to clear_pathspec()	2016-06-02 14:09:22 -07:00
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'js/windows-dotgit' into maint	2016-05-26 13:17:23 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	pathspec: rename free_pathspec() to clear_pathspec()	2016-06-02 14:09:22 -07:00
command-list.txt	…
commit-slab.h	…
commit.c	…
commit.h	…
config.c	Merge branch 'tb/core-eol-fix' into maint	2016-06-06 14:27:36 -07:00
config.mak.in	…
config.mak.uname	mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)	2016-05-26 13:12:02 -07:00
configure.ac	…
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
credential-cache--daemon.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	daemon: enable SO_KEEPALIVE for all sockets	2016-05-25 09:42:53 -07:00
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'jk/diff-compact-heuristic'	2016-06-10 15:26:06 -07:00
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir.c	Merge branch 'nd/worktree-various-heads'	2016-05-23 14:54:29 -07:00
dir.h	Merge branch 'nd/worktree-various-heads'	2016-05-23 14:54:29 -07:00
editor.c	…
entry.c	…
environment.c	Merge branch 'js/windows-dotgit' into maint	2016-05-26 13:17:23 -07:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Merge branch 'ew/fast-import-unpack-limit'	2016-06-20 11:01:00 -07:00
fetch-pack.c	…
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	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-difftool.perl	difftool: handle unmerged files in dir-diff mode	2016-05-16 14:53:05 -07:00
git-filter-branch.sh	…
git-instaweb.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	…
git-mergetool.sh	Merge branch 'nf/mergetool-prompt' into HEAD	2016-05-18 14:40:07 -07:00
git-p4.py	…
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	Merge branch 'js/rebase-i-dedup-call-to-rerere'	2016-06-03 14:38:01 -07:00
git-rebase--merge.sh	…
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	…
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-recommend-shallowness'	2016-06-20 11:01:01 -07:00
git-svn.perl	…
git-web--browse.sh	…
git.c	…
git.rc	…
gpg-interface.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	Merge branch 'rs/xdiff-hunk-with-func-line'	2016-06-20 11:01:04 -07:00
grep.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	Merge branch 'bn/http-cookiefile-config' into maint	2016-05-31 14:08:28 -07:00
http.h	…
ident.c	Merge branch 'da/user-useconfigonly' into HEAD	2016-05-18 14:40:05 -07:00
imap-send.c	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	…
line-log.h	…
line-range.c	…
line-range.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	Merge branch 'jc/ll-merge-internal'	2016-05-17 14:38:32 -07:00
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	log: prepare log/log-tree to reuse the diffopt.close_file attribute	2016-06-24 13:50:45 -07:00
log-tree.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
mailmap.h	…
match-trees.c	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	pathspec: rename free_pathspec() to clear_pathspec()	2016-06-02 14:09:22 -07:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object.c	…
object.h	…
pack-bitmap-write.c	…
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'lp/typofixes' into maint	2016-05-26 13:17:21 -07:00
pathspec.c	pathspec: rename free_pathspec() to clear_pathspec()	2016-06-02 14:09:22 -07:00
pathspec.h	pathspec: rename free_pathspec() to clear_pathspec()	2016-06-02 14:09:22 -07:00
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'et/pretty-format-c-auto'	2016-06-20 11:01:01 -07:00
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	…
prompt.h	…
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	…
ref-filter.c	…
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
remote-curl.c	…
remote-testsvn.c	…
remote.c	Merge branch 'nd/remote-plural-ours-plus-theirs' into maint	2016-05-26 13:17:18 -07:00
remote.h	…
replace_object.c	…
rerere.c	Merge branch 'jc/rerere-multi'	2016-05-23 14:54:38 -07:00
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	pathspec: rename free_pathspec() to clear_pathspec()	2016-06-02 14:09:22 -07:00
revision.h	…
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	…
send-pack.h	…
sequencer.c	…
sequencer.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'nd/worktree-various-heads'	2016-05-23 14:54:29 -07:00
sha1_name.c	…
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	…
split-index.h	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
submodule-config.c	submodule-config: keep shallow recommendation around	2016-05-27 10:40:45 -07:00
submodule-config.h	submodule-config: keep shallow recommendation around	2016-05-27 10:40: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	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
trace.h	…
trailer.c	…
trailer.h	…
transport-helper.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
transport.c	…
transport.h	…
tree-diff.c	pathspec: rename free_pathspec() to clear_pathspec()	2016-06-02 14:09:22 -07:00
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unicode_width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
unpack-trees.h	…
update_unicode.sh	…
upload-pack.c	upload-pack.c: use parse-options API	2016-05-31 10:17:20 -07:00
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	userdiff: add built-in pattern for CSS	2016-06-03 14:45:56 -07: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	Merge branch 'nd/worktree-various-heads'	2016-05-23 14:54:29 -07:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
write_or_die.c	…
ws.c	…
wt-status.c	Merge branch 'nd/worktree-various-heads'	2016-05-23 14:54:29 -07:00
wt-status.h	…
xdiff-interface.c	xdiff: don't trim common tail with -W	2016-05-31 13:08:56 -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 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