Go to file
Junio C Hamano afe427dc66 Merge branch 'kk/merge-octopus-optim' into next
The logic to determine that branches in an octopus merge are
independent has been optimized.

* kk/merge-octopus-optim:
  merge: use repo_in_merge_bases for octopus up-to-date check
2026-05-20 10:32:35 +09:00
.github l10n: bump mshick/add-pr-comment from v2 to v3 2026-04-30 18:21:55 +09:00
Documentation Merge branch 'pb/doc-diff-format-updates' into next 2026-05-20 10:32:34 +09:00
bin-wrappers
block-sha1
builtin Merge branch 'kk/merge-octopus-optim' into next 2026-05-20 10:32:35 +09:00
ci Merge branch 'jc/ci-enable-expensive' into next 2026-05-15 10:46:53 +09:00
compat Merge branch 'js/mingw-no-nedmalloc' into next 2026-05-13 12:21:27 +09:00
compiler-tricks
contrib mingw: drop the build-system plumbing for nedmalloc 2026-05-09 11:19:23 +09:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
odb odb, packfile: use size_t for streaming object sizes 2026-05-09 11:25:31 +09:00
oss-fuzz odb, packfile: use size_t for streaming object sizes 2026-05-09 11:25:31 +09:00
perl
po Merge branch 'master' of github.com:alshopov/git-po 2026-04-20 07:37:21 +08:00
refs Merge branch 'kn/refs-generic-helpers' into next 2026-05-15 10:46:52 +09:00
reftable
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
src
subprojects
t Merge branch 'kk/merge-octopus-optim' into next 2026-05-20 10:32:35 +09:00
templates
tools
trace2
xdiff Merge branch 'en/xdiff-cleanup-3' 2026-05-19 09:57:44 +09:00
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore Merge branch 'kh/name-rev-custom-format' 2026-05-19 09:57:44 +09:00
.gitlab-ci.yml
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
Cargo.toml
GIT-BUILD-OPTIONS.in
GIT-VERSION-FILE.in
GIT-VERSION-GEN Git 2.54 2026-04-19 19:01:39 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'kh/name-rev-custom-format' 2026-05-19 09:57:44 +09:00
README.md
RelNotes Start 2.55 cycle 2026-05-11 10:05:55 +09:00
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c
add-patch.h
advice.c
advice.h
alias.c alias: restore support for simple dotted aliases 2026-04-25 19:22:52 +09:00
alias.h
alloc.c
alloc.h
apply.c apply: plug leak on "patch too large" error 2026-05-16 13:51:16 +09:00
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 Merge branch 'kh/name-rev-custom-format' 2026-05-19 09:57:44 +09:00
bundle-uri.c
bundle-uri.h
bundle.c
bundle.h
cache-tree.c Merge branch 'dl/cache-tree-fully-valid-fix' 2026-05-11 10:05:52 +09:00
cache-tree.h
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 Merge branch 'kh/name-rev-custom-format' 2026-05-19 09:57:44 +09:00
commit-graph.c
commit-graph.h
commit-reach.c commit-reach: early exit paint_down_to_common for single merge-base 2026-05-12 09:33:43 +09:00
commit-reach.h commit-reach: early exit paint_down_to_common for single merge-base 2026-05-12 09:33:43 +09:00
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'jk/commit-sign-overflow-fix' into next 2026-05-20 10:32:34 +09:00
commit.h
common-exit.c
common-init.c
common-init.h
common-main.c
config.c
config.h
config.mak.dev Merge branch 'ps/clang-w-glibc-2.43-and-_Generic' 2026-05-13 10:57:55 +09:00
config.mak.in
config.mak.uname Merge branch 'js/mingw-no-nedmalloc' into next 2026-05-13 12:21:27 +09:00
configure.ac
connect.c Merge branch 'mm/git-url-parse' into next 2026-05-15 10:46:53 +09:00
connect.h url: move url_is_local_not_ssh to url.h 2026-05-06 09:48:26 +09:00
connected.c
connected.h
convert.c
convert.h
copy.c
copy.h
credential.c
credential.h
csum-file.c index-pack, unpack-objects: increase input buffer from 4 KiB to 128 KiB 2026-04-29 21:44:03 +09:00
csum-file.h
ctype.c
daemon.c
date.c
date.h
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h delta, packfile: use size_t for delta header sizes 2026-05-09 11:25:32 +09:00
diagnose.c
diagnose.h
diff-delta.c
diff-lib.c
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c Merge branch 'mm/diff-U-takes-no-negative-values' into next 2026-05-17 23:01:22 +09:00
diff.h diff: reject negative values for -U/--unified 2026-05-13 10:13:26 +09:00
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 ignore: note info/exclude lives in GIT_COMMON_DIR, not GIT_DIR 2026-05-13 10:25:52 +09:00
dir.h ignore: note info/exclude lives in GIT_COMMON_DIR, not GIT_DIR 2026-05-13 10:25:52 +09:00
editor.c
editor.h
entry.c
entry.h
environment.c
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c
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 index-pack, unpack-objects: increase input buffer from 4 KiB to 128 KiB 2026-04-29 21:44:03 +09:00
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
git-svn.perl
git-web--browse.sh
git-zlib.c git-zlib: handle data streams larger than 4GB 2026-05-09 11:25:31 +09:00
git-zlib.h git-zlib: handle data streams larger than 4GB 2026-05-09 11:25:31 +09:00
git.c Merge branch 'kh/name-rev-custom-format' 2026-05-19 09:57:44 +09:00
git.rc.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c grep: fix --column --only-match for 2nd and later matches 2026-04-25 19:23:23 +09:00
grep.h
hash-lookup.c
hash-lookup.h
hash.c
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'jh/alias-i18n-fixes' into next 2026-05-13 12:21:28 +09: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 Merge branch 'jk/dumb-http-alternate-fix' into next 2026-05-17 23:01:23 +09:00
http.c Merge branch 'aw/validate-proxy-url-scheme' into next 2026-05-15 10:46:53 +09:00
http.h
ident.c
ident.h
imap-send.c
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-ll.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c merge-ort: handle cached rename & trivial resolution interaction better 2026-04-22 16:21:05 -07:00
merge-ort.h
merge.c
merge.h
mergesort.h
meson.build Merge branch 'mm/git-url-parse' into next 2026-05-15 10:46:53 +09:00
meson_options.txt
midx-write.c
midx.c
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 odb, packfile: use size_t for streaming object sizes 2026-05-09 11:25:31 +09:00
object-file.h
object-name.c
object-name.h
object.c
object.h
odb.c
odb.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c pack-bitmap: fix pseudo-merge lookup for shared commits 2026-05-12 10:36:18 +09:00
pack-bitmap.c odb, packfile: use size_t for streaming object sizes 2026-05-09 11:25:31 +09:00
pack-bitmap.h
pack-check.c odb, packfile: use size_t for streaming object sizes 2026-05-09 11:25:31 +09:00
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.c delta, packfile: use size_t for delta header sizes 2026-05-09 11:25:32 +09:00
packfile.h odb, packfile: use size_t for streaming object sizes 2026-05-09 11:25:31 +09:00
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c
parse-options.h parse-options: clarify what "negated" means for PARSE_OPT_NONEG 2026-05-13 10:13:26 +09:00
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h patch-ids.h: add missing trailing parenthesis in documentation comment 2026-05-15 04:24:54 +09:00
path-walk.c
path-walk.h
path.c
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c Merge branch 'jk/pretty-no-strbuf-presizing' into next 2026-05-17 23:01:23 +09:00
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c
promisor-remote.h promisor-remote: document caller filtering contract 2026-05-15 04:24:54 +09:00
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
pseudo-merge.c pack-bitmap: prevent pattern leak on pseudo-merge re-assignment 2026-05-12 10:36:18 +09:00
pseudo-merge.h
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c
reachable.h
read-cache-ll.h
read-cache.c
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
refs.c Merge branch 'kn/refs-generic-helpers' into next 2026-05-15 10:46:52 +09:00
refs.h refs: return `ref_transaction_error` from `ref_transaction_update()` 2026-05-05 16:34:07 +09:00
refspec.c
refspec.h
remote-curl.c
remote.c url: move url_is_local_not_ssh to url.h 2026-05-06 09:48:26 +09:00
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 replay: allow callers to control what happens with empty commits 2026-04-27 22:20:56 +09:00
replay.h replay: allow callers to control what happens with empty commits 2026-04-27 22:20:56 +09:00
repo-settings.c
repo-settings.h
repository.c
repository.h
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c revision: use priority queue in limit_list() 2026-05-15 04:26:25 +09:00
revision.h
run-command.c
run-command.h
sane-ctype.h
scalar.c
send-pack.c
send-pack.h
sequencer.c Merge branch 'ag/rebase-update-refs-limit-to-branches' 2026-05-19 09:57:46 +09:00
sequencer.h sequencer: teach autostash apply to take optional conflict marker labels 2026-04-29 21:46:03 +09:00
serve.c
serve.h
server-info.c
server-info.h
setup.c safe.bareRepository: default to "explicit" with WITH_BREAKING_CHANGES 2026-04-27 14:50:54 +09:00
setup.h
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c shallow: fix relative deepen on non-shallow repositories 2026-05-12 09:00:16 +09:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c Merge branch 'rs/sideband-clear-line-before-print' 2026-05-19 09:57:46 +09:00
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
statinfo.c
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 Merge branch 'sj/submodule-update-clone-config-fix' 2026-05-19 09:57:46 +09:00
submodule-config.h
submodule.c
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.h
trace.c
trace.h
trace2.c
trace2.h
trailer.c trailer: change strbuf in-place in unfold_value() 2026-05-16 22:11:07 +09:00
trailer.h
transport-helper.c Merge branch 'jk/revert-aa-reap-transport-child-processes' 2026-05-12 11:04:44 +09:00
transport-internal.h
transport.c Merge branch 'jc/neuter-sideband-fixup' 2026-05-11 13:49:05 +09:00
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
unpack-trees.h
upload-pack.c
upload-pack.h
url.c url: return URL_SCHEME_UNKNOWN instead of dying 2026-05-06 09:48:27 +09:00
url.h url: return URL_SCHEME_UNKNOWN instead of dying 2026-05-06 09:48:27 +09:00
urlmatch.c urlmatch: define url_parse function 2026-05-06 09:48:28 +09:00
urlmatch.h urlmatch: define url_parse function 2026-05-06 09:48:28 +09:00
usage.c
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: rename get_worktree_from_repository() 2026-05-02 07:02:45 +09:00
worktree.h worktree: rename get_worktree_from_repository() 2026-05-02 07:02:45 +09:00
wrapper.c
wrapper.h
write-or-die.c
write-or-die.h
ws.c
ws.h
wt-status.c worktree: rename get_worktree_from_repository() 2026-05-02 07:02:45 +09:00
wt-status.h
xdiff-interface.c checkout -m: autostash when switching branches 2026-04-29 21:46:03 +09:00
xdiff-interface.h checkout -m: autostash when switching branches 2026-04-29 21:46:03 +09:00

README.md

Build status

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