Go to file

Junio C Hamano 5308423996 Merge branch 'jk/merge-ll-tempfile-cleanup' The external merge driver in 'git merge' now uses the tempfile API to create its temporary files. This ensures that these temporaries are reliably cleaned up even when the merge driver or its parent Git process is terminated abruptly. * jk/merge-ll-tempfile-cleanup: merge-ll: use tempfile API for external driver files merge-ll: catch close() errors when writing external tempfiles		2026-10-06 10:13:31 -07:00
.github	Merge branch 'js/rust-in-windows-ci'	2026-09-16 09:04:55 -07:00
Documentation	The 3rd batch	2026-10-05 13:52:30 -07:00
bin-wrappers	…
block-sha1	…
builtin	Merge branch 'tb/rerere-lock-grace'	2026-10-05 13:52:28 -07:00
ci	Merge branch 'js/gitlab-ci-windows-rust'	2026-10-06 10:13:31 -07:00
compat	Merge branch 'yt/winansi-die-lasterr-fix'	2026-10-05 13:52:28 -07:00
compiler-tricks	…
contrib	Merge branch 'yn/worktree-repair-completion'	2026-10-05 13:52:29 -07:00
ewah	…
git-gui	…
gitk-git	Merge branch 'master' of https://github.com/j6t/gitk	2026-09-11 09:03:58 -07:00
gitweb	…
mergetools	…
negotiator	…
odb	Merge branch 'ps/odb-alternates-at-creation'	2026-10-01 11:26:39 -07:00
oss-fuzz	oss-fuzz: handle reftable iterator initialization failures	2026-09-17 12:43:47 -07:00
perl	…
po	l10n: af: fix review comments	2026-09-27 20:41:50 +08:00
refs	Merge branch 'ak/refs-files-root-ref-lock'	2026-10-01 11:26:40 -07:00
reftable	Merge branch 'kn/reftable-optimize-reloading'	2026-09-07 09:32:05 -07:00
sha1	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
src	rust: respect CARGO_BUILD_TARGET when locating build output	2026-09-10 06:37:09 -07:00
subprojects	…
t	Merge branch 'jk/parse-revision-opt-fixes'	2026-10-05 13:52:29 -07:00
templates	…
tools	Merge branch 'jc/cocci-free-updates'	2026-10-01 11:26:40 -07:00
trace2	…
xdiff	…
.b4-config	…
.b4-cover-template	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	Makefile: precompile "git-compat-util.h"	2026-09-15 09:18:06 -07:00
.gitlab-ci.yml	Merge branch 'js/gitlab-ci-windows-rust'	2026-10-06 10:13:31 -07:00
.gitmodules	…
.mailmap	mailmap: normalize name for Yoichi NAKAYAMA	2026-09-17 09:43:13 -07:00
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
Cargo.toml	…
GIT-BUILD-OPTIONS.in	…
GIT-VERSION-FILE.in	…
GIT-VERSION-GEN	Start Git 2.98 cycle	2026-10-01 11:28:16 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'sg/precompile-git-compat-util'	2026-10-03 21:45:54 -07:00
README.md	…
RelNotes	Start Git 2.98 cycle	2026-10-01 11:28:16 -07:00
SECURITY.md	…
abspath.c	…
abspath.h	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	…
add-patch.h	…
advice.c	history: protect branches when squashing a range	2026-09-08 13:51:10 -07:00
advice.h	history: protect branches when squashing a range	2026-09-08 13:51:10 -07:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	…
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
attr.c	…
attr.h	…
banned.h	…
base85.c	…
base85.h	…
bisect.c	…
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	…
branch.h	…
build.rs	…
builtin.h	…
bundle-uri.c	…
bundle-uri.h	…
bundle.c	…
bundle.h	…
cache-tree.c	cache-tree: remove dependency on `the_repository`	2026-09-11 08:46:09 -07:00
cache-tree.h	cache-tree: remove dependency on `the_repository`	2026-09-11 08:46:09 -07:00
cbtree.c	…
cbtree.h	…
chdir-notify.c	…
chdir-notify.h	…
checkout.c	…
checkout.h	…
chunk-format.c	…
chunk-format.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit-graph.c	…
commit-graph.h	…
commit-reach.c	Merge branch 'of/commit-reach-repo-awareness'	2026-10-03 21:45:54 -07:00
commit-reach.h	Merge branch 'of/commit-reach-repo-awareness'	2026-10-03 21:45:54 -07:00
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	…
commit.h	…
common-exit.c	…
common-init.c	…
common-init.h	…
common-main.c	…
config.c	config: add git_config_append_parameter()	2026-09-17 12:37:00 -07:00
config.h	config: add git_config_append_parameter()	2026-09-17 12:37:00 -07:00
config.mak.dev	…
config.mak.in	…
config.mak.uname	Merge branch 'js/rust-in-windows-ci'	2026-09-16 09:04:55 -07:00
configure.ac	core: convert build-time USE_NSEC into runtime core.useNanosec	2026-09-11 11:10:01 -07:00
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
copy.h	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	…
date.h	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
diagnose.c	…
diagnose.h	…
diff-delta.c	…
diff-lib.c	…
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	diff --no-index: fix -R with file/directory conflicts	2026-09-21 10:59:36 -07:00
diff.c	…
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore-rotate.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'rs/dir-skip-nested-repo-fix'	2026-10-05 13:52:29 -07:00
dir.h	…
editor.c	…
editor.h	…
entry.c	…
entry.h	…
environment.c	core: convert build-time USE_NSEC into runtime core.useNanosec	2026-09-11 11:10:01 -07:00
environment.h	Merge branch 'dk/use-nsec-runtime'	2026-10-01 11:26:41 -07:00
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-object-info.c	…
fetch-object-info.h	…
fetch-pack.c	Merge branch 'of/commit-reach-repo-awareness'	2026-10-03 21:45:54 -07:00
fetch-pack.h	…
fmt-merge-msg.c	…
fmt-merge-msg.h	…
for-each-ref.h	…
fsck.c	…
fsck.h	…
fsmonitor--daemon.h	…
fsmonitor-ipc.c	…
fsmonitor-ipc.h	…
fsmonitor-ll.h	…
fsmonitor-path-utils.h	…
fsmonitor-settings.c	…
fsmonitor-settings.h	…
fsmonitor.c	…
fsmonitor.h	…
gettext.c	…
gettext.h	…
git-archimport.perl	…
git-compat-util.h	…
git-curl-compat.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-quiltimport.sh	…
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	builtin/submodule: rename "--ref-format=" to "--ref-storage-format="	2026-09-09 11:04:30 -07:00
git-svn.perl	…
git-web--browse.sh	…
git-zlib.c	…
git-zlib.h	…
git.c	…
git.rc.in	…
gpg-interface.c	gpg-interface: make signature-prefix matching length-aware	2026-09-17 12:43:46 -07:00
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash-lookup.c	…
hash-lookup.h	…
hash.c	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	help: rename "default-ref-format" to "default-ref-storage-format"	2026-09-09 11:04:31 -07:00
help.h	…
hex-ll.c	…
hex-ll.h	…
hex.c	…
hex.h	…
hook.c	…
hook.h	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	…
ident.h	…
imap-send.c	Merge branch 'wf/imap-send-draft'	2026-09-14 14:02:52 -07:00
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	…
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	…
list-objects-filter-options.h	…
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	…
list-objects.h	…
list.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	…
log-tree.h	…
loose.c	…
loose.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
match-trees.h	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-ll.c	Merge branch 'jk/merge-ll-tempfile-cleanup'	2026-10-06 10:13:31 -07:00
merge-ll.h	…
merge-ort-wrappers.c	…
merge-ort-wrappers.h	…
merge-ort.c	…
merge-ort.h	…
merge.c	…
merge.h	…
mergesort.h	…
meson.build	Merge branch 'js/mingw-build-updates'	2026-09-11 09:45:10 -07:00
meson_options.txt	Merge branch 'dk/use-nsec-runtime'	2026-10-01 11:26:41 -07:00
midx-write.c	…
midx.c	midx: validate incremental MIDX pack IDs	2026-09-17 12:43:46 -07:00
midx.h	…
name-hash.c	…
name-hash.h	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-file-convert.c	…
object-file-convert.h	…
object-file.c	object-file: flush transaction packfile before migrating objects	2026-09-23 20:02:43 -07:00
object-file.h	…
object-name.c	…
object-name.h	…
object.c	…
object.h	history: create squashed commits without editing	2026-09-08 13:51:10 -07:00
odb.c	Merge branch 'ps/odb-alternates-at-creation'	2026-10-01 11:26:39 -07:00
odb.h	Merge branch 'ps/odb-alternates-at-creation'	2026-10-01 11:26:39 -07:00
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
oidtree.c	…
oidtree.h	…
pack-bitmap-write.c	…
pack-bitmap.c	builtin/fsck: move bitmap verification into the packed source	2026-09-11 09:14:44 -07:00
pack-bitmap.h	builtin/fsck: move bitmap verification into the packed source	2026-09-11 09:14:44 -07:00
pack-check.c	…
pack-mtimes.c	…
pack-mtimes.h	…
pack-objects.c	…
pack-objects.h	…
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile-list.c	…
packfile-list.h	…
packfile.c	…
packfile.h	…
pager.c	…
pager.h	…
parallel-checkout.c	…
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	parse-options: allow for hidden aliases	2026-09-09 11:04:30 -07:00
parse-options.h	parse-options: allow for hidden aliases	2026-09-09 11:04:30 -07:00
parse.c	…
parse.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path-walk.c	…
path-walk.h	…
path.c	…
path.h	…
pathspec.c	Merge branch 'jc/pathspec-match-const'	2026-09-13 21:53:29 -07:00
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
preload-index.h	…
pretty.c	…
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol-caps.c	…
protocol-caps.h	…
protocol.c	…
protocol.h	…
prune-packed.c	…
prune-packed.h	…
pseudo-merge.c	…
pseudo-merge.h	…
quote.c	…
quote.h	…
range-diff.c	…
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache-ll.h	cache-tree: remove dependency on `the_repository`	2026-09-11 08:46:09 -07:00
read-cache.c	Merge branch 'dk/use-nsec-runtime'	2026-10-01 11:26:41 -07:00
read-cache.h	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	…
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
reflog.c	…
reflog.h	reflog: fix default expiry periods	2026-09-24 11:22:13 -07:00
refs.c	refs: expose function to parse reference URIs	2026-09-09 11:04:31 -07:00
refs.h	refs: expose function to parse reference URIs	2026-09-09 11:04:31 -07:00
refspec.c	…
refspec.h	…
remote-curl.c	…
remote.c	…
remote.h	…
repack-cruft.c	…
repack-filtered.c	…
repack-geometry.c	…
repack-midx.c	…
repack-promisor.c	…
repack.c	…
repack.h	…
replace-object.c	…
replace-object.h	…
replay.c	Merge branch 'en/midx-missing-pack-fallback'	2026-09-10 05:36:17 -07:00
replay.h	…
repo-settings.c	…
repo-settings.h	…
repository.c	Merge branch 'jk/submodule-error-leak'	2026-09-13 21:53:29 -07:00
repository.h	…
rerere.c	rerere: do not record failed conflict resolution data	2026-09-17 12:43:46 -07:00
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jk/parse-revision-opt-fixes'	2026-10-05 13:52:29 -07:00
revision.h	…
run-command.c	…
run-command.h	…
sane-ctype.h	…
scalar.c	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'tb/rerere-lock-grace'	2026-10-05 13:52:28 -07:00
sequencer.h	Merge branch 'hn/history-squash'	2026-10-01 11:26:39 -07:00
serve.c	…
serve.h	…
server-info.c	…
server-info.h	…
setup.c	Merge branch 'ps/ref-storage-format'	2026-10-01 11:26:40 -07:00
setup.h	Merge branch 'ps/ref-storage-format'	2026-10-01 11:26:40 -07:00
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shared.mak	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	…
sparse-index.c	cache-tree: drop `the_repository` in `cache_tree_fully_valid()`	2026-09-11 08:46:09 -07:00
sparse-index.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
stash.h	…
statinfo.c	core: convert build-time USE_NSEC into runtime core.useNanosec	2026-09-11 11:10:01 -07:00
statinfo.h	…
strbuf.c	…
strbuf.h	…
string-list.c	…
string-list.h	…
strmap.c	…
strmap.h	…
strvec.c	…
strvec.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	submodule-config: stop registering submodule sources	2026-09-11 08:46:10 -07:00
submodule-config.h	submodule-config: remove uses of `the_repository`	2026-09-11 08:46:10 -07:00
submodule.c	submodule-config: remove uses of `the_repository`	2026-09-11 08:46:10 -07:00
submodule.h	…
symlinks.c	…
symlinks.h	…
tag.c	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	tmp-objdir: drop unused function to register alternate	2026-09-11 08:46:10 -07:00
tmp-objdir.h	tmp-objdir: drop unused function to register alternate	2026-09-11 08:46:10 -07:00
trace.c	…
trace.h	…
trace2.c	…
trace2.h	…
trailer.c	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	…
transport.h	…
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unix-stream-server.c	…
unix-stream-server.h	…
unpack-trees.c	cache-tree: remove dependency on `the_repository`	2026-09-11 08:46:09 -07:00
unpack-trees.h	…
upload-pack.c	Merge branch 'rr/upload-pack-swap-shallow-wanted-ref'	2026-10-03 21:45:55 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	Merge branch 'jc/you-still-use-that'	2026-09-07 09:32:05 -07:00
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version-def.h.in	…
version.c	…
version.h	…
versioncmp.c	…
versioncmp.h	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	…
worktree.h	…
wrapper.c	wrapper: guard writev_in_full() against signed overflow	2026-09-17 12:43:46 -07:00
wrapper.h	…
write-or-die.c	…
write-or-die.h	…
ws.c	…
ws.h	…
wt-status.c	…
wt-status.h	Revert "Merge branch 'en/no-amend-during-conflicts'"	2026-09-23 11:18:51 -07:00
xdiff-interface.c	…
xdiff-interface.h	…

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.adoc to get started, then see Documentation/giteveryday.adoc for a useful minimum set of commands, and Documentation/git-<commandname>.adoc 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.adoc (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 and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email to git+subscribe@vger.kernel.org (see https://subspace.kernel.org/subscribing.html for details). The mailing list archives are available at https://lore.kernel.org/git/, https://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