Go to file

Junio C Hamano 26597cb0cc Merge branch 'ma/create-pseudoref-with-null-old-oid' "git update-ref A B" is supposed to ensure that ref A does not yet exist when B is a NULL OID, but this check was not done correctly for pseudo-refs outside refs/ hierarchy, e.g. MERGE_HEAD. * ma/create-pseudoref-with-null-old-oid: refs: handle zero oid for pseudorefs t1400: add tests around adding/deleting pseudorefs refs.c: refer to "object ID", not "sha1", in error messages		2018-05-30 14:04:08 +09:00
.github	…
Documentation	Merge branch 'bp/status-rename-config'	2018-05-30 14:04:07 +09:00
block-sha1	…
builtin	Merge branch 'bp/status-rename-config'	2018-05-30 14:04:07 +09:00
ci	…
compat	…
contrib	Merge branch 'fg/completion-external'	2018-05-23 14:38:25 +09:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
perl	Merge branch 'ab/git-svn-get-record-typofix'	2018-05-08 15:59:28 +09:00
po	…
ppc	…
refs	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
sha1collisiondetection@19d97bf5af	…
sha1dc	…
t	Merge branch 'ma/create-pseudoref-with-null-old-oid'	2018-05-30 14:04:08 +09:00
templates	…
vcs-svn	Convert remaining die*(BUG) messages	2018-05-06 19:06:14 +09:00
xdiff	…
.clang-format	…
.gitattributes	.gitattributes: add a diff driver for Python	2018-04-27 09:18:55 +09:00
.gitignore	Merge branch 'ds/commit-graph'	2018-05-08 15:59:20 +09:00
.gitmodules	…
.mailmap	mailmap: update brian m. carlson's email address	2018-05-08 12:21:10 +09:00
.travis.yml	…
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	Git 2.17.1	2018-05-22 14:28:26 +09:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'js/runtime-prefix'	2018-05-08 15:59:34 +09:00
README.md	…
RelNotes	Git 2.17.1	2018-05-22 14:28:26 +09:00
abspath.c	…
aclocal.m4	…
advice.c	Merge branch 'js/deprecate-grafts'	2018-05-23 14:38:17 +09:00
advice.h	Deprecate support for .git/info/grafts	2018-04-30 11:12:31 +09:00
alias.c	…
alloc.c	…
apply.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
apply.h	…
archive-tar.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
archive-zip.c	cache.h: add repository argument to oid_object_info	2018-04-26 10:54:27 +09:00
archive.c	…
archive.h	…
argv-array.c	argv_array: offer to split a string by whitespace	2018-04-26 12:52:57 +09:00
argv-array.h	argv_array: offer to split a string by whitespace	2018-04-26 12:52:57 +09:00
attr.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
blame.h	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	Merge branch 'ds/commit-graph'	2018-05-08 15:59:20 +09:00
bulk-checkin.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
bulk-checkin.h	…
bundle.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check-racy.c	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
color.h	…
column.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
column.h	…
combine-diff.c	…
command-list.txt	…
commit-graph.c	Merge branch 'sb/oid-object-info'	2018-05-23 14:38:16 +09:00
commit-graph.h	…
commit-slab.h	…
commit.c	Merge branch 'js/deprecate-grafts'	2018-05-23 14:38:17 +09:00
commit.h	Merge branch 'js/deprecate-grafts'	2018-05-23 14:38:17 +09:00
common-main.c	Merge branch 'dj/runtime-prefix'	2018-05-08 15:59:17 +09:00
config.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
config.h	Merge branch 'tb/config-default'	2018-05-08 15:59:27 +09:00
config.mak.dev	…
config.mak.in	…
config.mak.uname	Merge branch 'nd/repack-keep-pack'	2018-05-23 14:38:14 +09:00
configure.ac	Merge branch 'es/fread-reads-dir-autoconf-fix'	2018-04-25 13:29:01 +09:00
connect.c	Merge branch 'bw/server-options'	2018-05-23 14:38:15 +09:00
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'ls/checkout-encoding'	2018-05-08 15:59:22 +09:00
convert.h	Merge branch 'ls/checkout-encoding'	2018-05-08 15:59:22 +09:00
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	Merge branch 'lw/daemon-log-destination'	2018-04-25 13:28:58 +09:00
date.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
decorate.c	…
decorate.h	…
delta.h	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
diff.h	add status config and command line options for rename detection	2018-05-13 10:57:37 +09:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir-iterator.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
dir-iterator.h	…
dir.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
dir.h	Merge branch 'sb/submodule-move-nested'	2018-05-08 15:59:17 +09:00
editor.c	…
entry.c	…
environment.c	Merge branch 'ls/checkout-encoding'	2018-05-08 15:59:22 +09:00
exec-cmd.c	Merge branch 'js/runtime-prefix'	2018-05-08 15:59:34 +09:00
exec-cmd.h	Merge branch 'dj/runtime-prefix'	2018-05-08 15:59:17 +09:00
fast-import.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
fetch-object.c	…
fetch-object.h	…
fetch-pack.c	Merge branch 'bw/server-options'	2018-05-23 14:38:15 +09:00
fetch-pack.h	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
fmt-merge-msg.h	…
fsck.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
fsck.h	fsck: detect gitmodules files	2018-05-21 23:55:12 -04:00
fsmonitor.c	Merge branch 'bp/fsmonitor-prime-index'	2018-04-25 13:29:04 +09:00
fsmonitor.h	…
generate-cmdlist.sh	…
gettext.c	Merge branch 'js/runtime-prefix'	2018-05-08 15:59:34 +09:00
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
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	…
git-p4.py	…
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	rebase -i --root: let the sequencer handle even the initial part	2018-05-06 13:21:58 +09:00
git-rebase--merge.sh	…
git-rebase.sh	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'dd/send-email-reedit'	2018-05-30 14:04:03 +09:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	Sync with Git 2.16.4	2018-05-22 14:25:26 +09:00
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'js/no-pager-shorthand'	2018-05-23 14:38:18 +09:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
grep.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
http-fetch.c	Merge branch 'ma/http-walker-no-partial'	2018-05-08 15:59:35 +09:00
http-push.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
http-walker.c	…
http.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
http.h	…
ident.c	…
imap-send.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
iterator.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
line-log.h	…
line-range.c	…
line-range.h	…
list-objects-filter-options.c	…
list-objects-filter-options.h	…
list-objects-filter.c	Merge branch 'sb/oid-object-info'	2018-05-23 14:38:16 +09:00
list-objects-filter.h	…
list-objects.c	…
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
lockfile.h	…
log-tree.c	Merge branch 'bc/format-patch-cover-no-attach'	2018-05-23 14:38:21 +09:00
log-tree.h	format-patch: make cover letters always text/plain	2018-05-02 12:55:00 +09:00
ls-refs.c	…
ls-refs.h	…
mailinfo.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
merge-recursive.h	merge: add merge.renames config setting	2018-05-08 16:19:41 +09:00
merge.c	…
mergesort.c	…
mergesort.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-store.h	Merge branch 'nd/pack-objects-pack-struct'	2018-05-23 14:38:19 +09:00
object.c	Merge branch 'sb/oid-object-info'	2018-05-23 14:38:16 +09:00
object.h	Merge branch 'nd/pack-objects-pack-struct'	2018-05-23 14:38:19 +09:00
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
pack-bitmap.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
pack-bitmap.h	…
pack-check.c	packfile: add repository argument to unpack_entry	2018-04-26 10:54:27 +09:00
pack-objects.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
pack-objects.h	Merge branch 'nd/pack-objects-pack-struct'	2018-05-23 14:38:19 +09:00
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
packfile.h	Merge branch 'sb/oid-object-info'	2018-05-23 14:38:16 +09:00
pager.c	pager: set COLUMNS to term_columns()	2018-05-13 10:45:03 +09:00
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
path.h	…
pathspec.c	Convert remaining die*(BUG) messages	2018-05-06 19:06:14 +09:00
pathspec.h	…
pkt-line.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
pretty.h	…
prio-queue.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
quote.c	…
quote.h	…
reachable.c	cache.h: add repository argument to oid_object_info	2018-04-26 10:54:27 +09:00
reachable.h	…
read-cache.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
ref-filter.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
ref-filter.h	Merge branch 'ot/libify-get-ref-atom-value'	2018-05-08 15:59:18 +09:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'ma/create-pseudoref-with-null-old-oid'	2018-05-30 14:04:08 +09:00
refs.h	Merge branch 'sb/object-store-replace'	2018-05-08 15:59:21 +09:00
remote-curl.c	Merge branch 'ma/http-walker-no-partial'	2018-05-08 15:59:35 +09:00
remote-testsvn.c	…
remote.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
remote.h	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
replace-object.c	Merge branch 'sb/object-store-replace'	2018-05-23 14:38:09 +09:00
replace-object.h	…
repository.c	Merge branch 'nd/repo-clear-keep-the-index'	2018-05-30 14:04:05 +09:00
repository.h	Merge branch 'sb/object-store-replace'	2018-05-08 15:59:21 +09:00
rerere.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jk/unavailable-can-be-missing'	2018-05-30 14:04:08 +09:00
revision.h	…
run-command.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'js/sequencer-and-root-commits'	2018-05-30 14:04:04 +09:00
sequencer.h	Merge branch 'js/sequencer-and-root-commits'	2018-05-30 14:04:04 +09:00
serve.c	…
serve.h	…
server-info.c	…
setup.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-file.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
sha1-lookup.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
sha1-lookup.h	…
sha1-name.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
sigchain.h	…
split-index.c	…
split-index.h	…
strbuf.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
strbuf.h	Merge branch 'en/rename-directory-detection-reboot'	2018-05-23 14:38:19 +09:00
streaming.c	cache.h: add repository argument to oid_object_info_extended	2018-04-26 10:54:27 +09:00
streaming.h	…
string-list.c	…
string-list.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
submodule-config.h	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
submodule.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
submodule.h	Merge branch 'sb/submodule-move-nested'	2018-05-08 15:59:17 +09:00
symlinks.c	…
tag.c	cache.h: add repository argument to oid_object_info	2018-04-26 10:54:27 +09:00
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
tmp-objdir.h	…
trace.c	…
trace.h	…
trailer.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
trailer.h	…
transport-helper.c	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
transport-internal.h	…
transport.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
transport.h	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
unpack-trees.h	merge-recursive: fix overwriting dirty files involved in renames	2018-05-08 16:11:00 +09:00
upload-pack.c	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	test-tool: help verifying BUG() code paths	2018-05-06 19:06:13 +09:00
userdiff.c	…
userdiff.h	…
utf8.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
utf8.h	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
write-or-die.c	…
ws.c	…
wt-status.c	Merge branch 'bp/status-rename-config'	2018-05-30 14:04:07 +09:00
wt-status.h	add status config and command line options for rename detection	2018-05-13 10:57:37 +09:00
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09: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 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