Go to file

Junio C Hamano e4095da40e Merge branch 'en/merge-recursive-skip-fix' When the sparse checkout feature is in use, "git cherry-pick" and other mergy operations lost the skip_worktree bit when a path that is excluded from checkout requires content level merge, which is resolved as the same as the HEAD version, without materializing the merge result in the working tree, which made the path appear as deleted. This has been corrected by preserving the skip_worktree bit (and not materializing the file in the working tree). * en/merge-recursive-skip-fix: merge-recursive: preserve skip_worktree bit when necessary t3507: add a testcase showing failure with sparse checkout		2018-08-15 15:08:26 -07:00
.github	…
Documentation	Merge branch 'hs/gpgsm'	2018-08-15 15:08:23 -07:00
block-sha1	…
builtin	Merge branch 'jt/tag-following-with-proto-v2-fix'	2018-08-15 15:08:25 -07:00
ci	travis-ci: fail if Coccinelle static analysis found something to transform	2018-07-23 12:08:38 -07:00
compat	Merge branch 'nd/command-list'	2018-07-24 14:50:50 -07:00
contrib	Merge branch 'ds/commit-graph-fsck'	2018-08-02 15:30:40 -07:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
negotiator	Merge branch 'jt/fetch-negotiator-skipping'	2018-08-02 15:30:46 -07:00
perl	…
po	…
ppc	…
refs	Merge branch 'jk/size-t'	2018-08-15 15:08:25 -07:00
sha1collisiondetection@19d97bf5af	…
sha1dc	…
t	Merge branch 'en/merge-recursive-skip-fix'	2018-08-15 15:08:26 -07:00
templates	…
vcs-svn	…
xdiff	Merge branch 'sb/histogram-less-memory'	2018-08-15 15:08:25 -07:00
.clang-format	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	…
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'sg/coccicheck-updates'	2018-08-15 15:08:25 -07:00
README.md	…
RelNotes	…
abspath.c	…
aclocal.m4	…
advice.c	Merge branch 'ab/checkout-default-remote'	2018-08-02 15:30:41 -07:00
advice.h	Merge branch 'ab/checkout-default-remote'	2018-08-02 15:30:41 -07:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'jm/cache-entry-from-mem-pool'	2018-08-02 15:30:43 -07:00
apply.h	…
archive-tar.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
archive-zip.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
archive.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	Merge branch 'jm/cache-entry-from-mem-pool'	2018-08-02 15:30:43 -07:00
blame.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
branch.h	…
builtin.h	…
bulk-checkin.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
bulk-checkin.h	…
bundle.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
bundle.h	…
cache-tree.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
cache-tree.h	…
cache.h	Merge branch 'jk/core-use-replace-refs'	2018-08-15 15:08:23 -07:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check-racy.c	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit-graph.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
commit-graph.h	commit-graph: add repo arg to graph readers	2018-07-17 15:47:48 -07:00
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'jt/commit-graph-per-object-store'	2018-08-02 15:30:47 -07:00
commit.h	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
common-main.c	…
config.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
config.h	Merge branch 'jk/fsck-gitmodules-gently'	2018-08-02 15:30:39 -07:00
config.mak.dev	Makefile: add a DEVOPTS flag to get pedantic compilation	2018-07-25 09:52:32 -07:00
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	connect.c: mark more strings for translation	2018-07-23 11:19:10 -07:00
connect.h	fixup! connect.h: avoid forward declaration of an enum	2018-07-09 14:35:39 -07:00
connected.c	…
connected.h	…
convert.c	Merge branch 'jk/size-t'	2018-08-15 15:08:25 -07: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	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	Merge branch 'jk/has-uncommitted-changes-fix'	2018-08-02 15:30:38 -07:00
diff-no-index.c	…
diff.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
diff.h	Merge branch 'sb/diff-color-move-more'	2018-08-02 15:30:40 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
dir.h	…
editor.c	…
entry.c	…
environment.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
exec-cmd.c	exec-cmd.c: mark more strings for translation	2018-07-23 11:19:10 -07:00
exec-cmd.h	…
fast-import.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
fetch-negotiator.c	negotiator/skipping: skip commits during fetch	2018-07-16 14:51:12 -07:00
fetch-negotiator.h	negotiator/skipping: skip commits during fetch	2018-07-16 14:51:12 -07:00
fetch-object.c	…
fetch-object.h	…
fetch-pack.c	Merge branch 'bw/fetch-pack-i18n'	2018-08-15 15:08:20 -07:00
fetch-pack.h	Merge branch 'jt/fetch-nego-tip'	2018-08-02 15:30:43 -07:00
fmt-merge-msg.h	…
fsck.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	…
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	Merge branch 'mb/filter-branch-optim'	2018-07-18 12:20:32 -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-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	…
git-rebase--merge.sh	Merge branch 'en/rebase-i-microfixes'	2018-07-18 12:20:33 -07:00
git-rebase--preserve-merges.sh	…
git-rebase.sh	Merge branch 'en/rebase-consistency'	2018-07-24 14:50:43 -07:00
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'jm/send-email-tls-auth-on-batch'	2018-08-02 15:30:46 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	Merge branch 'sb/submodule-core-worktree'	2018-07-18 12:20:28 -07:00
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'jk/core-use-replace-refs'	2018-08-15 15:08:23 -07:00
git.rc	…
gpg-interface.c	gpg-interface: introduce new signature format "x509" using gpgsm	2018-07-18 10:02:23 -07:00
gpg-interface.h	gpg-interface: make parse_gpg_output static and remove from interface header	2018-07-11 10:05:22 -07:00
graph.c	…
graph.h	…
grep.c	Merge branch 'tb/grep-only-matching'	2018-08-02 15:30:44 -07:00
grep.h	Merge branch 'tb/grep-only-matching'	2018-08-02 15:30:44 -07:00
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	hex: switch to using the_hash_algo	2018-07-16 14:27:39 -07:00
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	…
imap-send.c	…
iterator.h	…
json-writer.c	json_writer: new routines to create JSON data	2018-07-16 13:55:39 -07:00
json-writer.h	json_writer: new routines to create JSON data	2018-07-16 13:55:39 -07:00
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07: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/object-store-grafts'	2018-07-18 12:20:28 -07:00
list-objects-filter.h	…
list-objects.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'jk/core-use-replace-refs'	2018-08-15 15:08:23 -07:00
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
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 'en/merge-recursive-skip-fix'	2018-08-15 15:08:26 -07:00
merge-recursive.h	…
merge.c	Merge branch 'en/dirty-merge-fixes'	2018-08-02 15:30:45 -07:00
mergesort.c	…
mergesort.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-store.h	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
object.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
object.h	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	Merge branch 'jt/remove-pack-bitmap-global'	2018-07-18 12:20:30 -07:00
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	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
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 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
path.h	Merge branch 'bb/pedantic'	2018-07-24 14:50:47 -07:00
pathspec.c	…
pathspec.h	…
pkt-line.c	pkt-line.c: mark more strings for translation	2018-07-23 11:19:10 -07:00
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'jk/size-t'	2018-08-15 15:08:25 -07:00
pretty.h	…
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 'en/dirty-merge-fixes'	2018-08-02 15:30:45 -07:00
ref-filter.c	Merge branch 'jt/commit-graph-per-object-store'	2018-08-02 15:30:47 -07:00
ref-filter.h	…
reflog-walk.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
reflog-walk.h	…
refs.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
refs.h	…
refspec.c	refspec.c: mark more strings for translation	2018-07-23 11:19:10 -07:00
refspec.h	…
remote-curl.c	…
remote-testsvn.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
remote.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
remote.h	…
replace-object.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
replace-object.h	check_replace_refs: rename to read_replace_refs	2018-07-18 15:45:14 -07:00
repository.c	…
repository.h	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
rerere.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jt/tags-to-promised-blobs-fix'	2018-08-02 15:30:46 -07:00
revision.h	Merge branch 'jt/partial-clone-fsck-connectivity'	2018-07-24 14:50:47 -07:00
run-command.c	…
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-file.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	…
split-index.h	…
strbuf.c	Merge branch 'jk/size-t'	2018-08-15 15:08:25 -07:00
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	string-list.c: avoid conversion from void * to function pointer	2018-07-09 14:37:50 -07:00
string-list.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	Merge branch 'jk/fsck-gitmodules-gently'	2018-08-02 15:30:39 -07:00
submodule-config.h	…
submodule.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
submodule.h	…
symlinks.c	…
tag.c	Merge branch 'jt/tags-to-promised-blobs-fix'	2018-08-02 15:30:46 -07:00
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	…
tmp-objdir.h	…
trace.c	…
trace.h	…
trailer.c	…
trailer.h	…
transport-helper.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
transport-internal.h	…
transport.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
transport.h	Merge branch 'jt/fetch-nego-tip'	2018-08-02 15:30:43 -07:00
tree-diff.c	…
tree-walk.c	Merge branch 'bc/object-id'	2018-08-02 15:30:39 -07:00
tree-walk.h	…
tree.c	Merge branch 'jm/cache-entry-from-mem-pool'	2018-08-02 15:30:43 -07:00
tree.h	…
unicode-width.h	unicode: update the width tables to Unicode 11	2018-07-09 14:02:51 -07:00
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'jm/cache-entry-from-mem-pool'	2018-08-02 15:30:43 -07:00
unpack-trees.h	…
upload-pack.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	Merge branch 'jk/size-t'	2018-08-15 15:08:25 -07:00
utf8.h	reencode_string: use size_t for string lengths	2018-07-24 10:19:29 -07:00
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
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 'sb/object-store-lookup'	2018-08-02 15:30:42 -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 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.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

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