Go to file

Junio C Hamano 9ca488c04b Merge branch 'nd/rebase-show-current-patch' The new "--show-current-patch" option gives an end-user facing way to get the diff being applied when "git rebase" (and "git am") stops with a conflict. * nd/rebase-show-current-patch: rebase: introduce and use pseudo-ref REBASE_HEAD rebase: add --show-current-patch am: add --show-current-patch		2018-03-06 14:54:02 -08:00
.github	…
Documentation	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
block-sha1	…
builtin	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
ci	Merge branch 'sg/travis-linux32-sanity'	2018-02-13 13:39:16 -08:00
compat	…
contrib	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
perl	Merge branch 'ab/simplify-perl-makefile'	2018-02-13 13:39:03 -08:00
po	…
ppc	…
refs	Merge branch 'kg/packed-ref-cache-fix'	2018-02-15 14:55:42 -08:00
sha1collisiondetection@19d97bf5af	…
sha1dc	…
t	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
templates	…
vcs-svn	…
xdiff	…
.clang-format	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	Git 2.16.2	2018-02-15 15:21:23 -08:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'tz/do-not-clean-spec-file'	2018-02-28 13:37:58 -08:00
README.md	…
RelNotes	Git 2.16.2	2018-02-15 15:21:23 -08:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
apply.c	Merge branch 'tk/apply-dev-null-verify-name-fix'	2018-02-28 13:37:55 -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 'ys/bisect-object-id-missing-conversion-fix' into maint	2018-02-27 10:43:55 -08:00
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	…
bulk-checkin.c	bulk-checkin: abstract SHA-1 usage	2018-02-02 11:28:41 -08:00
bulk-checkin.h	…
bundle.c	Merge branch 'rs/lose-leak-pending' into maint	2018-02-15 15:18:11 -08:00
bundle.h	…
cache-tree.c	Merge branch 'po/object-id'	2018-02-15 14:55:43 -08:00
cache-tree.h	…
cache.h	Merge branch 'bc/hash-algo'	2018-02-15 14:55:47 -08:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	Merge branch 'tb/crlf-conv-flags'	2018-02-13 13:39:08 -08:00
command-list.txt	…
commit-slab.h	…
commit.c	Merge branch 'po/object-id'	2018-02-15 14:55:43 -08:00
commit.h	Merge branch 'rs/lose-leak-pending' into maint	2018-02-15 15:18:11 -08:00
common-main.c	…
config.c	Merge branch 'tb/crlf-conv-flags'	2018-02-13 13:39:08 -08:00
config.h	…
config.mak.in	…
config.mak.uname	config.mak.uname: remove SPARSE_FLAGS setting for cygwin	2018-02-12 12:19:18 -08:00
configure.ac	…
connect.c	…
connect.h	…
connected.c	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
connected.h	…
convert.c	Merge branch 'po/object-id'	2018-02-15 14:55:43 -08:00
convert.h	…
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	…
csum-file.c	csum-file: abstract uses of SHA-1	2018-02-02 11:28:41 -08:00
csum-file.h	csum-file: abstract uses of SHA-1	2018-02-02 11:28:41 -08:00
ctype.c	…
daemon.c	Merge branch 'lw/daemon-log-destination'	2018-02-21 12:45:04 -08:00
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	trace: measure where the time is spent in the index-heavy operations	2018-02-02 11:20:16 -08:00
diff-no-index.c	…
diff.c	Merge branch 'nd/ita-wt-renames-in-status' into maint	2018-02-27 10:39:35 -08:00
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	Merge branch 'po/object-id'	2018-02-15 14:55:43 -08:00
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'nd/fix-untracked-cache-invalidation'	2018-02-27 10:33:50 -08:00
dir.h	Merge branch 'nd/fix-untracked-cache-invalidation'	2018-02-27 10:33:50 -08:00
editor.c	…
entry.c	…
environment.c	Merge branch 'tb/crlf-conv-flags'	2018-02-13 13:39:08 -08:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	csum-file: rename sha1file to hashfile	2018-02-02 11:28:41 -08:00
fetch-object.c	…
fetch-object.h	…
fetch-pack.c	Merge branch 'js/packet-read-line-check-null'	2018-02-27 10:33:55 -08:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor.c	dir.c: ignore paths containing .git when invalidating untracked cache	2018-02-07 12:27:02 -08:00
fsmonitor.h	dir.c: ignore paths containing .git when invalidating untracked cache	2018-02-07 12:27:02 -08:00
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	…
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	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
git-rebase--interactive.sh	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
git-rebase--merge.sh	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
git-rebase.sh	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'xz/send-email-batch-size'	2018-03-06 14:54:02 -08:00
git-sh-i18n.sh	git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME	2018-02-08 10:09:45 -08:00
git-sh-setup.sh	…
git-stash.sh	Merge branch 'tg/stash-with-pathspec-fix' into maint	2018-02-15 15:18:13 -08:00
git-submodule.sh	…
git-svn.perl	Merge branch 'jm/svn-pushmergeinfo-fix' into maint	2018-02-15 15:18:11 -08:00
git-web--browse.sh	…
git.c	Mark messages for translations	2018-02-13 10:59:58 -08:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash.h	hash: update obsolete reference to SHA1_HEADER	2018-02-09 09:56:10 -08:00
hashmap.c	…
hashmap.h	Merge branch 'rb/hashmap-h-compilation-fix'	2018-02-13 13:39:10 -08:00
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	Merge branch 'jt/http-redact-cookies'	2018-02-13 13:39:11 -08:00
http.h	…
ident.c	…
imap-send.c	…
iterator.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	…
line-log.h	…
line-range.c	…
line-range.h	…
list-objects-filter-options.c	…
list-objects-filter-options.h	…
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	Merge branch 'jh/fsck-promisors'	2018-02-13 13:39:03 -08:00
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	…
log-tree.h	…
mailinfo.c	Merge branch 'jc/mailinfo-cleanup-fix'	2018-02-13 13:39:14 -08:00
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'jc/merge-symlink-ours-theirs' into maint	2018-02-15 15:18:12 -08:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
name-hash.c	Merge branch 'bp/name-hash-dirname-fix'	2018-02-27 10:33:53 -08:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object.c	Merge branch 'jh/fsck-promisors'	2018-02-13 13:39:03 -08:00
object.h	Merge branch 'rs/lose-leak-pending' into maint	2018-02-15 15:18:11 -08:00
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	csum-file: rename sha1file to hashfile	2018-02-02 11:28:41 -08:00
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	pack-check: convert various uses of SHA-1 to abstract forms	2018-02-02 11:28:41 -08:00
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	csum-file: rename sha1file to hashfile	2018-02-02 11:28:41 -08:00
pack.h	csum-file: rename sha1file to hashfile	2018-02-02 11:28:41 -08:00
packfile.c	Merge branch 'jt/binsearch-with-fanout'	2018-02-27 10:34:03 -08:00
packfile.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	trace: measure where the time is spent in the index-heavy operations	2018-02-02 11:20:16 -08:00
pretty.c	…
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
quote.c	Merge branch 'jk/sq-dequote-on-bogus-input'	2018-02-27 10:34:02 -08:00
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'bc/hash-algo'	2018-02-15 14:55:47 -08:00
ref-filter.c	Merge branch 'rs/lose-leak-pending' into maint	2018-02-15 15:18:11 -08:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
remote-curl.c	Merge branch 'jk/push-options-via-transport-fix'	2018-02-28 13:37:58 -08:00
remote-testsvn.c	…
remote.c	fetch: add a --prune-tags option and fetch.pruneTags config	2018-02-09 13:10:13 -08:00
remote.h	fetch: add a --prune-tags option and fetch.pruneTags config	2018-02-09 13:10:13 -08:00
replace_object.c	…
repository.c	Merge branch 'tg/split-index-fixes'	2018-02-13 13:39:13 -08:00
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'rs/lose-leak-pending' into maint	2018-02-15 15:18:11 -08:00
revision.h	Merge branch 'rs/lose-leak-pending' into maint	2018-02-15 15:18:11 -08:00
run-command.c	…
run-command.h	…
send-pack.c	always check for NULL return from packet_read_line()	2018-02-08 12:37:40 -08:00
send-pack.h	…
sequencer.c	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
sequencer.h	Merge branch 'pw/sequencer-in-process-commit'	2018-02-13 13:39:15 -08:00
server-info.c	…
setup.c	Merge branch 'as/ll-i18n'	2018-02-27 10:33:58 -08:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	packfile: refactor hash search with fanout table	2018-02-15 13:08:55 -08:00
sha1-lookup.h	packfile: refactor hash search with fanout table	2018-02-15 13:08:55 -08:00
sha1_file.c	Merge branch 'bc/hash-algo'	2018-02-15 14:55:47 -08:00
sha1_name.c	…
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	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	Correct mispellings of ".gitmodule" to ".gitmodules"	2018-02-14 11:34:34 -08:00
submodule-config.h	…
submodule.c	…
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	…
trace.h	…
trailer.c	…
trailer.h	…
transport-helper.c	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
transport-internal.h	…
transport.c	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
transport.h	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
tree-diff.c	…
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/fix-untracked-cache-invalidation'	2018-02-27 10:33:50 -08:00
unpack-trees.h	…
upload-pack.c	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -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	…
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	…
write_or_die.c	…
ws.c	…
wt-status.c	Merge branch 'nd/ita-wt-renames-in-status' into maint	2018-02-27 10:39:35 -08:00
wt-status.h	Merge branch 'nd/ita-wt-renames-in-status' into maint	2018-02-27 10:39:35 -08:00
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.

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