Go to file

Junio C Hamano fb2afea366 t5573, t7612: clean up after unexpected success of 'pull' and 'merge' The previous steps added test_when_finished to tests that run 'git pull' or 'git merge' with expectation of success, so that the test after them can start from a known state even when their 'git pull' invocation unexpectedly fails. However, tests that run 'git pull' or 'git merge' expecting it not to succeed forgot to protect later tests the same way---if they unexpectedly succeed, the test after them would start from an unexpected state. Reset and checkout the initial commit after all these tests, whether they expect their invocations to succeed or fail. Signed-off-by: Junio C Hamano <gitster@pobox.com>		2017-12-19 12:58:57 -08:00
.github	…
Documentation	merge: add config option for verifySignatures	2017-12-12 10:51:38 -08:00
block-sha1	…
builtin	merge: add config option for verifySignatures	2017-12-12 10:51:38 -08:00
ci	travis-ci: fix running P4 and Git LFS tests in Linux build jobs	2017-11-02 11:05:28 +09:00
compat	Merge branch 'bp/fsmonitor'	2017-11-21 14:07:50 +09:00
contrib	Merge branch 'ac/complete-pull-autostash'	2017-12-06 09:23:37 -08:00
ewah	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
git-gui	Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-build	2017-11-22 14:57:52 +09:00
gitk-git	…
gitweb	Merge branch 'gc/gitweb-filetest-acl'	2017-11-06 14:24:30 +09:00
mergetools	…
perl	Git/Packet.pm: use 'if' instead of 'unless'	2017-11-22 16:23:55 +09:00
po	l10n: Update Catalan translation	2017-10-29 10:04:12 +08:00
ppc	…
refs	Merge branch 'mh/avoid-rewriting-packed-refs' into maint	2017-12-06 09:08:50 -08:00
sha1collisiondetection@19d97bf5af	…
sha1dc	…
t	t5573, t7612: clean up after unexpected success of 'pull' and 'merge'	2017-12-19 12:58:57 -08:00
templates	fsmonitor: simplify determining the git worktree under Windows	2017-11-13 10:02:20 +09:00
vcs-svn	…
xdiff	Merge branch 'rs/include-comments-before-the-function-header'	2017-11-28 13:41:50 +09:00
.clang-format	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	mailmap: use Kaartic Sivaraam's new address	2017-11-03 23:00:07 +09:00
.travis.yml	travis-ci: don't build Git for the static analysis job	2017-11-02 11:05:30 +09:00
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	Start preparation for 2.15.1	2017-11-15 12:05:22 +09:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'bw/protocol-v1'	2017-12-06 09:23:44 -08:00
README.md	…
RelNotes	Prepare for 2.15.2	2017-12-06 09:10:35 -08:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
apply.c	Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint	2017-12-06 09:09:03 -08:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
base85.c	…
bisect.c	Merge branch 'mh/tidy-ref-update-flags'	2017-11-15 12:14:29 +09:00
bisect.h	Merge branch 'ma/bisect-leakfix'	2017-11-15 12:14:28 +09:00
blame.c	Merge branch 'bw/diff-opt-impl-to-bitfields'	2017-11-09 14:31:27 +09:00
blame.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'jc/branch-name-sanity'	2017-11-28 13:41:49 +09:00
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	Merge branch 'ma/lockfile-fixes'	2017-11-06 13:11:21 +09:00
cache-tree.h	…
cache.h	Merge branch 'bw/protocol-v1'	2017-12-06 09:23:44 -08:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
column.c	column: do not include pager.c	2017-10-24 10:19:06 +09:00
column.h	…
combine-diff.c	Merge branch 'bw/diff-opt-impl-to-bitfields'	2017-11-09 14:31:27 +09:00
command-list.txt	…
commit-slab.h	…
commit.c	reduce_heads: fix memory leaks	2017-11-08 11:34:00 +09:00
commit.h	reduce_heads: fix memory leaks	2017-11-08 11:34:00 +09:00
common-main.c	…
config.c	Merge branch 'hm/config-parse-expiry-date'	2017-12-06 09:23:37 -08:00
config.h	Merge branch 'hm/config-parse-expiry-date'	2017-12-06 09:23:37 -08:00
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	connect: correct style of C-style comment	2017-11-21 14:01:03 +09:00
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'ma/ts-cleanups' into maint	2017-10-23 14:19:02 +09:00
convert.h	…
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	…
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'bp/fsmonitor'	2017-11-21 14:07:50 +09:00
diff-no-index.c	diff: make struct diff_flags members lowercase	2017-11-01 11:51:40 +09:00
diff.c	Merge branch 'jc/ignore-cr-at-eol'	2017-11-27 11:06:31 +09:00
diff.h	Merge branch 'bw/diff-opt-impl-to-bitfields'	2017-11-09 14:31:27 +09:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	diff: make struct diff_flags members lowercase	2017-11-01 11:51:40 +09:00
diffcore-rename.c	diff: make struct diff_flags members lowercase	2017-11-01 11:51:40 +09:00
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'bp/fsmonitor'	2017-11-21 14:07:50 +09:00
dir.h	Merge branch 'bp/fsmonitor'	2017-11-21 14:07:50 +09:00
editor.c	…
entry.c	Merge branch 'bp/fsmonitor'	2017-11-21 14:07:50 +09:00
environment.c	Merge branch 'bp/fsmonitor'	2017-11-21 14:07:50 +09:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Merge branch 'jk/write-in-full-fix' into maint	2017-10-23 14:37:22 +09:00
fetch-pack.c	Merge branch 'jk/fewer-pack-rescan'	2017-12-06 09:23:42 -08:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor.c	fsmonitor: store fsmonitor bitmap before splitting index	2017-11-10 14:05:01 +09:00
fsmonitor.h	fsmonitor: store fsmonitor bitmap before splitting index	2017-11-10 14:05:01 +09:00
generate-cmdlist.sh	generate-cmdlist: avoid non-deterministic output	2017-11-22 14:56:30 +09:00
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	Merge branch 'sb/bisect-run-empty'	2017-11-15 12:14:36 +09:00
git-compat-util.h	…
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	rebase: use mboxrd format to avoid split errors	2017-11-18 12:30:16 +09:00
git-rebase--interactive.sh	Merge branch 'ad/rebase-i-serie-typofix' into maint	2017-11-21 14:05:32 +09:00
git-rebase--merge.sh	…
git-rebase.sh	Merge branch 'tz/redirect-fix' into maint	2017-12-06 09:09:04 -08:00
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	Merge branch 'ph/stash-save-m-option-fix'	2017-12-06 09:23:43 -08:00
git-submodule.sh	…
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'ma/branch-list-paginate'	2017-11-28 13:41:50 +09:00
git.rc	mingw: include the full version information in the resources	2017-11-01 13:43:52 +09:00
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	Merge branch 'ab/pcre-v2' into maint	2017-11-21 14:05:30 +09:00
grep.h	Merge branch 'ab/pcre-v2' into maint	2017-11-21 14:05:30 +09:00
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	notes: move hex_to_bytes() to hex.c and export it	2017-11-01 10:35:35 +09:00
http-backend.c	…
http-fetch.c	…
http-push.c	http-push: use hex_to_bytes()	2017-11-01 10:35:39 +09:00
http-walker.c	…
http.c	Merge branch 'bw/protocol-v1'	2017-12-06 09:23:44 -08:00
http.h	…
ident.c	…
imap-send.c	Merge branch 'rs/imap-send-next-arg-fix' into maint	2017-11-27 10:57:00 +09:00
iterator.h	…
khash.h	…
kwset.c	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
kwset.h	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
levenshtein.c	…
levenshtein.h	…
line-log.c	…
line-log.h	…
line-range.c	…
line-range.h	…
list-objects.c	…
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'bw/diff-opt-impl-to-bitfields'	2017-11-09 14:31:27 +09:00
log-tree.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'	2017-11-27 11:06:34 +09:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
mru.c	…
mru.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	Merge branch 'bw/diff-opt-impl-to-bitfields'	2017-11-09 14:31:27 +09:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	Merge branch 'rs/hex-to-bytes-cleanup'	2017-11-09 14:31:27 +09:00
notes.h	…
object.c	…
object.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.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	…
packfile.c	…
packfile.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	diff: make struct diff_flags members lowercase	2017-11-01 11:51:40 +09:00
patch-ids.h	…
path.c	Merge branch 'ao/path-use-xmalloc'	2017-10-28 10:18:40 +09:00
path.h	…
pathspec.c	Merge branch 'ex/deprecate-empty-pathspec-as-match-all'	2017-11-06 13:11:29 +09:00
pathspec.h	…
pkt-line.c	Merge branch 'bw/protocol-v1'	2017-12-06 09:23:44 -08:00
pkt-line.h	…
preload-index.c	…
pretty.c	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'tb/add-renormalize'	2017-11-27 11:06:37 +09:00
ref-filter.c	Merge branch 'js/for-each-ref-remote-name-and-ref'	2017-11-15 12:14:32 +09:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	refs: update some more docs to use "oid" rather than "sha1"	2017-11-06 10:31:08 +09:00
refs.h	refs: update some more docs to use "oid" rather than "sha1"	2017-11-06 10:31:08 +09:00
remote-curl.c	…
remote-testsvn.c	…
remote.c	Merge branch 'js/for-each-ref-remote-name-and-ref'	2017-11-15 12:14:32 +09:00
remote.h	for-each-ref: let upstream/push report the remote ref name	2017-11-08 10:18:23 +09:00
replace_object.c	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'bw/diff-opt-impl-to-bitfields'	2017-11-09 14:31:27 +09:00
revision.h	…
run-command.c	…
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint	2017-12-06 09:09:03 -08:00
sequencer.h	…
server-info.c	…
setup.c	Merge branch 'js/early-config' into maint	2017-11-15 12:05:01 +09:00
sh-i18n--envsubst.c	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'jk/fewer-pack-rescan'	2017-12-06 09:23:42 -08:00
sha1_name.c	Merge branch 'jc/branch-name-sanity'	2017-11-28 13:41:49 +09:00
sha1dc_git.c	…
sha1dc_git.h	…
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	Merge branch 'ma/ts-cleanups' into maint	2017-10-23 14:19:02 +09:00
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	…
submodule-config.h	…
submodule.c	Merge branch 'sb/submodule-recursive-checkout-detach-head'	2017-12-06 09:23:35 -08:00
submodule.h	…
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	…
tmp-objdir.h	…
trace.c	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
trace.h	…
trailer.c	…
trailer.h	…
transport-helper.c	Merge branch 'jk/write-in-full-fix' into maint	2017-10-23 14:37:22 +09:00
transport.c	…
transport.h	…
tree-diff.c	diff: make struct diff_flags members lowercase	2017-11-01 11:51:40 +09: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 'bp/fsmonitor'	2017-11-21 14:07:50 +09:00
unpack-trees.h	…
upload-pack.c	Merge branch 'bw/protocol-v1'	2017-12-06 09:23:44 -08:00
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	Merge branch 'bc/object-id'	2017-11-06 14:24:27 +09:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	wrapper.c: consistently quote filenames in error messages	2017-11-06 11:53:14 +09:00
write_or_die.c	…
ws.c	…
wt-status.c	Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint	2017-11-21 14:05:29 +09:00
wt-status.h	status: add option to show ignored files differently	2017-10-31 11:54:21 +09:00
xdiff-interface.c	xdiff-interface: export comparing and hashing strings	2017-10-26 11:23:22 +09:00
xdiff-interface.h	xdiff-interface: export comparing and hashing strings	2017-10-26 11:23:22 +09: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 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