Go to file

Junio C Hamano a5953f6818 Merge branch 'jv/merge-nothing-into-void' into maint "git merge FETCH_HEAD" dereferenced NULL pointer when merging nothing into an unborn history (which is arguably unusual usage, which perhaps was the reason why nobody noticed it). * jv/merge-nothing-into-void: merge: fix NULL pointer dereference when merging nothing into void		2016-04-14 18:57:49 -07:00
Documentation	Merge branch 'gf/fetch-pack-direct-object-fetch' into maint	2016-04-14 18:57:44 -07:00
block-sha1	…
builtin	Merge branch 'jv/merge-nothing-into-void' into maint	2016-04-14 18:57:49 -07:00
compat	config --show-origin: report paths with forward slashes	2016-03-23 09:58:48 -07:00
contrib	…
ewah	…
git-gui	…
gitk-git	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	2016-03-20 18:05:10 -07:00
gitweb	…
mergetools	…
perl	git-svn: shorten glob error message	2016-03-15 01:35:39 +00:00
po	Merge branch 'master' of https://github.com/vnwildman/git	2016-03-23 23:01:51 +08:00
ppc	…
refs	…
t	Merge branch 'jv/merge-nothing-into-void' into maint	2016-04-14 18:57:49 -07:00
templates	Merge branch 'ma/update-hooks-sample-typofix' into maint	2016-03-10 11:13:50 -08:00
vcs-svn	…
xdiff	Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint	2016-04-14 18:57:46 -07:00
.gitattributes	…
.gitignore	…
.mailmap	…
.travis.yml	…
COPYING	…
GIT-VERSION-GEN	Git 2.8.1	2016-04-03 10:14:12 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'jc/sane-grep'	2016-03-16 13:16:54 -07:00
README.md	…
RelNotes	Git 2.8.1	2016-04-03 10:14:12 -07:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
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	…
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	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
cache-tree.h	…
cache.h	Merge branch 'jk/pack-idx-corruption-safety' into maint	2016-03-10 11:13:46 -08:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit-slab.h	…
commit.c	…
commit.h	…
config.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
config.mak.in	…
config.mak.uname	Merge branch 'tb/avoid-gcc-on-darwin-10-6'	2016-03-21 09:20:13 -07:00
configure.ac	Merge branch 'jc/sane-grep'	2016-03-16 13:16:54 -07:00
connect.c	Merge branch 'cn/deprecate-ssh-git-url'	2016-03-16 13:16:40 -07:00
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
credential-cache--daemon.c	Merge branch 'jk/credential-cache-comment-exit' into maint	2016-04-14 18:37:16 -07:00
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
diff.h	Merge branch 'maint-2.5' into maint-2.6	2016-03-17 11:26:18 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir.c	Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint	2016-04-14 18:37:15 -07:00
dir.h	Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint	2016-04-14 18:37:15 -07:00
editor.c	…
entry.c	…
environment.c	setup: make startup_info available everywhere	2016-03-06 17:17:37 -08: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	…
fast-import.c	…
fetch-pack.c	…
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	…
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 'es/st-add4-gcc-4.2-workaround' into maint	2016-03-21 09:19:27 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-difftool.perl	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-merge-octopus.sh	…
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	…
git-mergetool.sh	mergetool: honor tempfile configuration when resolving delete conflicts	2016-03-10 14:07:57 -08:00
git-p4.py	…
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	Merge branch 'jc/sane-grep'	2016-03-16 13:16:54 -07:00
git-rebase--merge.sh	…
git-rebase.sh	…
git-relink.perl	…
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	send-email: ignore trailing whitespace in mailrc alias file	2016-03-18 14:47:10 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	sane_grep: pass "-a" if grep accepts it	2016-03-10 15:35:43 -08:00
git-stash.sh	…
git-submodule.sh	…
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	Merge branch 'ak/git-strip-extension-from-dashed-command' into maint	2016-03-10 11:13:48 -08:00
git.rc	…
git.spec.in	git.spec.in: use README.md, not README	2016-04-03 10:12:48 -07:00
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7	2016-03-16 10:42:32 -07:00
http-walker.c	…
http.c	Merge branch 'jx/http-no-proxy'	2016-03-10 10:56:43 -08:00
http.h	…
ident.c	…
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	Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7	2016-03-16 10:42:32 -07:00
list-objects.h	list-objects: pass full pathname to callbacks	2016-03-16 10:41:04 -07:00
ll-merge.c	…
ll-merge.h	…
lockfile.c	lockfile: improve error message when lockfile exists	2016-03-01 10:16:46 -08:00
lockfile.h	…
log-tree.c	…
log-tree.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	mailmap: do not resolve blobs in a non-repository	2016-03-06 17:19:11 -08:00
mailmap.h	…
match-trees.c	…
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-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
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	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
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.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	config --show-origin: report paths with forward slashes	2016-03-23 09:58:48 -07:00
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	…
prompt.h	…
quote.c	…
quote.h	…
reachable.c	Merge branch 'maint-2.5' into maint-2.6	2016-03-17 11:26:18 -07:00
reachable.h	…
read-cache.c	…
ref-filter.c	…
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
remote-curl.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
remote-testsvn.c	…
remote.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
remote.h	…
replace_object.c	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'maint-2.5' into maint-2.6	2016-03-17 11:26:18 -07:00
revision.h	Merge branch 'maint-2.5' into maint-2.6	2016-03-17 11:26:18 -07:00
run-command.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
run-command.h	Merge branch 'sb/submodule-parallel-fetch'	2016-03-04 13:46:30 -08:00
send-pack.c	…
send-pack.h	…
sequencer.c	…
sequencer.h	…
server-info.c	…
setup.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'jk/pack-idx-corruption-safety' into maint	2016-03-10 11:13:46 -08:00
sha1_name.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
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	Merge branch 'jk/getwholeline-getdelim-empty' into maint	2016-04-14 18:57:46 -07:00
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
submodule-config.c	…
submodule-config.h	…
submodule.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
submodule.h	…
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
test-chmtime.c	…
test-config.c	…
test-ctype.c	…
test-date.c	…
test-delta.c	…
test-dump-cache-tree.c	…
test-dump-split-index.c	…
test-dump-untracked-cache.c	…
test-fake-ssh.c	…
test-genrandom.c	…
test-hashmap.c	…
test-index-version.c	…
test-line-buffer.c	…
test-match-trees.c	use setup_git_directory() in test-* programs	2016-03-07 12:27:35 -08:00
test-mergesort.c	…
test-mktemp.c	…
test-parse-options.c	…
test-path-utils.c	…
test-prio-queue.c	…
test-read-cache.c	…
test-regex.c	…
test-revision-walking.c	use setup_git_directory() in test-* programs	2016-03-07 12:27:35 -08:00
test-run-command.c	…
test-scrap-cache-tree.c	…
test-sha1-array.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
test-string-list.c	…
test-submodule-config.c	…
test-subprocess.c	…
test-svn-fe.c	…
test-urlmatch-normalization.c	…
test-wildmatch.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
trace.h	…
trailer.c	…
trailer.h	…
transport-helper.c	…
transport.c	Merge branch 'cn/deprecate-ssh-git-url'	2016-03-16 13:16:40 -07:00
transport.h	…
tree-diff.c	Merge branch 'maint-2.4' into maint-2.5	2016-03-17 11:24:14 -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	…
unpack-trees.h	…
update_unicode.sh	…
upload-pack.c	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	…
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	…
write_or_die.c	…
ws.c	…
wt-status.c	Merge branch 'mg/wt-status-mismarked-i18n'	2016-03-14 10:46:17 -07:00
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	…

README.md

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from 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-commandname.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with "man gittutorial" or "git help tutorial", and the documentation of each command with "man git-commandname" or "git help commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt ("man gitcvs-migration" or "git help cvs-migration" if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. The mailing list archives are available at 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