Go to file
Antonin Delpeuch 9c93ba4d0a merge-recursive: honor diff.algorithm
The documentation claims that "recursive defaults to the diff.algorithm
config setting", but this is currently not the case. This fixes it,
ensuring that diff.algorithm is used when -Xdiff-algorithm is not
supplied. This affects the following porcelain commands: "merge",
"rebase", "cherry-pick", "pull", "stash", "log", "am" and "checkout".
It also affects the "merge-tree" ancillary interrogator.

This change refactors the initialization of merge options to introduce
two functions, "init_merge_ui_options" and "init_merge_basic_options"
instead of just one "init_merge_options". This design follows the
approach used in diff.c, providing initialization methods for
porcelain and plumbing commands respectively. Thanks to that, the
"replay" and "merge-recursive" plumbing commands remain unaffected by
diff.algorithm.

Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-07-13 18:10:49 -07:00
.github Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint 2024-05-24 16:59:12 -07:00
block-sha1
builtin merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
ci Merge branch 'jc/fuzz-sans-curl' 2024-07-02 09:59:01 -07:00
compat Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
contrib Merge branch 'kn/osxkeychain-skip-idempotent-store' 2024-05-28 11:17:11 -07:00
Documentation The ninteenth batch 2024-07-08 14:53:11 -07:00
ewah ewah: bitmap_equals_ewah() 2024-05-24 11:40:44 -07:00
git-gui Merge https://github.com/j6t/git-gui 2024-07-07 22:50:59 -07:00
gitk-git Makefile(s): avoid recipe prefix in conditional statements 2024-04-08 14:42:32 -07:00
gitweb Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
mergetools Switch grep from non-portable BRE to portable ERE 2024-05-17 12:13:18 -07:00
negotiator global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
oss-fuzz Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
perl Git.pm: use array in command_bidi_pipe example 2024-06-17 13:41:51 -07:00
po Merge branch 'pk/swedish-translation' 2024-06-23 10:25:57 +02:00
refs Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
reftable Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
sha1 avoid SHA-1 functions deprecated in OpenSSL 3+ 2023-08-01 08:34:56 -07:00
sha1collisiondetection@855827c583
sha1dc doc: refer to internet archive 2023-11-26 10:07:06 +09:00
sha256 Merge branch 'ew/hash-with-openssl-evp' 2023-08-09 16:18:15 -07:00
t merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
templates Merge branch 'jp/use-diff-index-in-pre-commit-sample' into maint-2.43 2024-02-08 16:22:02 -08:00
trace2 Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
xdiff xdiff: mark unused parameter in xdl_call_hunk_func() 2022-12-13 22:16:23 +09:00
.cirrus.yml Merge branch 'cb/use-freebsd-13-2-at-cirrus-ci' 2024-02-06 14:31:22 -08:00
.clang-format clang-format: fix typo in comment 2023-11-01 12:24:19 +09:00
.editorconfig editorconfig: add Makefiles to "text files" 2024-03-23 11:42:31 -07:00
.gitattributes Makefile(s): do not enforce "all indents must be done with tab" 2024-05-05 16:54:35 +02:00
.gitignore builtin/refs: new command to migrate ref storage formats 2024-06-06 09:04:34 -07:00
.gitlab-ci.yml gitlab-ci: add job to run make check-docs 2024-06-06 08:20:51 -07:00
.gitmodules
.mailmap mailmap: change primary address for Linus Arver 2024-04-16 22:25:11 -07:00
.tsan-suppressions
abspath.c abspath: move related functions to abspath 2023-06-12 13:49:35 -07:00
abspath.h abspath: move related functions to abspath 2023-06-12 13:49:35 -07:00
aclocal.m4
add-interactive.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
add-interactive.h
add-patch.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
advice.c Merge branch 'pw/rebase-i-error-message' into maint-2.45 2024-07-02 09:27:56 -07:00
advice.h rebase -i: improve error message when picking merge 2024-05-30 10:02:58 -07:00
alias.c config: plug various memory leaks 2024-05-27 11:20:00 -07:00
alias.h rebase -m: fix serialization of strategy options 2023-04-10 09:53:19 -07:00
alloc.c hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
alloc.h git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
apply.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
apply.h Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
archive-tar.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
archive-zip.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
archive.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
archive.h archive.h: remove unnecessary include 2023-12-26 12:04:31 -08:00
attr.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
attr.h Merge branch 'jc/varargs-attributes' 2024-06-17 15:55:55 -07:00
banned.h banned.h: mark strtok() and strtok_r() as banned 2023-04-27 08:51:11 -07:00
base85.c base85.h: move declarations for base85.c functions from cache.h 2023-04-24 12:47:32 -07:00
base85.h base85.h: move declarations for base85.c functions from cache.h 2023-04-24 12:47:32 -07:00
bisect.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
bisect.h
blame.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
blame.h blame.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
blob.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
blob.h blob: drop unused parts of parse_blob_buffer() 2022-12-13 22:16:22 +09:00
bloom.c Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
bloom.h bloom: introduce deinit_bloom_filters() 2024-06-25 13:52:06 -07:00
branch.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
branch.h typo: replace 'commitish' with 'committish' 2024-04-11 15:14:56 -07:00
builtin.h global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
bulk-checkin.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
bulk-checkin.h bulk-checkin: only support blobs in index_bulk_checkin 2023-09-26 10:17:56 -07:00
bundle-uri.c Merge branch 'xx/bundie-uri-fixes' 2024-07-08 14:53:11 -07:00
bundle-uri.h clone: set fetch.bundleURI if appropriate 2023-01-31 08:57:48 -08:00
bundle.c Merge branch 'xx/bundie-uri-fixes' 2024-07-08 14:53:11 -07:00
bundle.h unbundle: extend object verification for fetches 2024-06-20 10:30:08 -07:00
cache-tree.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
cache-tree.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
cbtree.c treewide: ensure one of the appropriate headers is sourced first 2023-02-23 17:25:28 -08:00
cbtree.h treewide: remove unnecessary git-compat-util.h includes in headers 2023-02-23 17:25:28 -08:00
chdir-notify.c treewide: reduce includes of cache.h in other headers 2023-04-11 08:52:11 -07:00
chdir-notify.h
check-builtins.sh
checkout.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
checkout.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
chunk-format.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
chunk-format.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
CODE_OF_CONDUCT.md CoC: whitespace fix 2024-01-23 10:40:10 -08:00
color.c color: add support for 12-bit RGB colors 2024-05-02 09:30:38 -07:00
color.h color: add support for 12-bit RGB colors 2024-05-02 09:30:38 -07:00
column.c column: guard against negative padding 2024-02-13 10:18:57 -08:00
column.h
combine-diff.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
command-list.txt builtin/refs: new command to migrate ref storage formats 2024-06-06 09:04:34 -07:00
commit-graph.c Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
commit-graph.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
commit-reach.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
commit-reach.h commit-reach(repo_get_merge_bases_many_dirty): pass on errors 2024-02-29 08:06:01 -08:00
commit-slab-decl.h
commit-slab-impl.h treewide: remove unnecessary git-compat-util.h includes in headers 2023-02-23 17:25:28 -08:00
commit-slab.h
commit.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
commit.h Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
common-main.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
config.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
config.h Merge branch 'tb/pseudo-merge-reachability-bitmap' 2024-06-24 16:39:13 -07:00
config.mak.dev config.mak.dev: enable -Wwrite-strings warning 2024-06-07 10:30:56 -07:00
config.mak.in
config.mak.uname Merge branch 'js/build-fuzz-more-often' 2024-04-30 14:49:44 -07:00
configure.ac global: convert trivial usages of test <expr> -a/-o <expr> 2023-11-11 09:21:00 +09:00
connect.c refs: call branches branches 2024-06-04 15:07:08 -07:00
connect.h v0 protocol: use size_t for capability length/offset 2023-04-14 15:08:13 -07:00
connected.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
connected.h receive-pack: only use visible refs for connectivity check 2022-11-17 16:22:52 -05:00
convert.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
convert.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
copy.c Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42 2024-05-24 16:57:43 -07:00
copy.h Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41 2024-05-24 16:57:02 -07:00
COPYING
credential.c credential: clear expired c->credential, unify secret clearing 2024-06-06 11:42:40 -07:00
credential.h credential: clear expired c->credential, unify secret clearing 2024-06-06 11:42:40 -07:00
csum-file.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
csum-file.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
ctype.c kwset: move translation table from ctype 2023-07-05 11:41:18 -07:00
daemon.c daemon: free listen_addr before returning 2023-10-05 14:54:58 -07:00
date.c date: detect underflow/overflow when parsing dates with timezone offset 2024-06-25 17:07:41 -07:00
date.h date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
decorate.c decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
decorate.h t/: migrate helper/test-example-decorate to the unit testing framework 2024-05-28 13:53:36 -07:00
delta-islands.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
delta-islands.h delta-islands: free island_marks and bitmaps 2023-02-03 18:01:46 -08:00
delta.h
detect-compiler Handle some compiler versions containing a dash 2023-04-26 09:20:50 -07:00
diagnose.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
diagnose.h treewide: remove unnecessary inclusions of parse-options.h from headers 2023-03-20 11:55:18 -07:00
diff-delta.c
diff-lib.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
diff-merges.c diff-merges: introduce '--dd' option 2023-10-09 12:47:29 -07:00
diff-merges.h
diff-no-index.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
diff.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
diff.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
diffcore-break.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
diffcore-delta.c Merge branch 'en/diffcore-delta-final-line-fix' into maint-2.43 2024-02-13 14:44:48 -08:00
diffcore-order.c git-compat-util.h: remove unneccessary include of wildmatch.h 2023-06-21 13:39:54 -07:00
diffcore-pickaxe.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
diffcore-rename.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
diffcore-rotate.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
diffcore.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
dir-iterator.c dir-iterator: support iteration in sorted order 2024-02-21 09:58:05 -08:00
dir-iterator.h dir-iterator: support iteration in sorted order 2024-02-21 09:58:05 -08:00
dir.c Merge branch 'jk/cap-exclude-file-size' into maint-2.45 2024-06-28 15:53:17 -07:00
dir.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
editor.c launch_editor: waiting message on error 2024-04-15 10:13:32 -07:00
editor.h editor: move editor-related functions and declarations into common file 2023-04-11 08:52:10 -07:00
entry.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
entry.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
environment.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
environment.h config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
exec-cmd.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'xx/bundie-uri-fixes' 2024-07-08 14:53:11 -07:00
fetch-pack.h fetch-pack: expose fsckObjects configuration logic 2024-06-20 10:30:07 -07:00
fmt-merge-msg.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
fmt-merge-msg.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
fsck.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
fsck.h Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -07:00
fsmonitor--daemon.h fsmonitor--daemon.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
fsmonitor-ipc.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
fsmonitor-ipc.h fsmonitor: relocate socket file if .git directory is remote 2022-10-05 11:05:22 -07:00
fsmonitor-ll.h fsmonitor-ll.h: split this header out of fsmonitor.h 2023-06-21 13:39:54 -07:00
fsmonitor-path-utils.h fsmonitor: deal with synthetic firmlinks on macOS 2022-10-05 11:05:23 -07:00
fsmonitor-settings.c config: clarify memory ownership in git_config_pathname() 2024-05-27 11:19:59 -07:00
fsmonitor-settings.h fsmonitor: check for compatability before communicating with fsmonitor 2022-10-05 11:05:23 -07:00
fsmonitor.c fsmonitor: support case-insensitive events 2024-03-06 09:10:06 -08:00
fsmonitor.h fsmonitor-ll.h: split this header out of fsmonitor.h 2023-06-21 13:39:54 -07:00
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
gettext.h Sync with 2.33.8 2023-04-17 21:15:56 +02:00
git-archimport.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-compat-util.h Merge branch 'rs/no-openssl-compilation-fix-on-macos' 2024-04-23 11:52:38 -07:00
git-curl-compat.h remote-curl: add Transfer-Encoding header only for older curl 2024-04-10 19:24:48 +02:00
git-cvsexportcommit.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-cvsimport.perl Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
git-cvsserver.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-difftool--helper.sh git-difftool--helper: honor --trust-exit-code with --dir-diff 2024-02-20 09:30:32 -08:00
git-filter-branch.sh
git-instaweb.sh doc: switch links to https 2023-11-26 10:07:05 +09:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool: new config guiDefault supports auto-toggling gui by DISPLAY 2023-04-05 21:03:29 -07:00
git-mergetool.sh mergetool: new config guiDefault supports auto-toggling gui by DISPLAY 2023-04-05 21:03:29 -07:00
git-p4.py git-p4: show Perforce error to the user 2024-05-08 15:44:14 -07:00
git-quiltimport.sh git-quiltimport: avoid an unnecessary subshell 2024-03-16 11:08:57 -07:00
git-request-pull.sh request-pull: filter out SSH/X.509 tag signatures 2023-01-25 15:54:41 -08:00
git-send-email.perl Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41 2024-05-24 16:57:02 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh Merge branch 'ss/pull-v-recurse-fix' 2022-12-28 12:06:17 +09:00
git-svn.perl Merge branch 'tz/send-email-negatable-options' into maint-2.43 2024-02-08 16:22:01 -08:00
GIT-VERSION-GEN Git 2.45.2 2024-05-30 17:18:43 -07:00
git-web--browse.sh
git-zlib.c git-zlib: move declarations for git-zlib functions from cache.h 2023-04-11 08:52:10 -07:00
git-zlib.h git-zlib: move declarations for git-zlib functions from cache.h 2023-04-11 08:52:10 -07:00
git.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
git.rc
gpg-interface.c global: convert intentionally-leaking config strings to consts 2024-06-07 10:30:48 -07:00
gpg-interface.h tag: fix sign_buffer() call to create a signed tag 2024-02-07 10:47:25 -08:00
graph.c diff --stat: add config option to limit filename width 2023-09-18 09:39:07 -07:00
graph.h doc: switch links to https 2023-11-26 10:07:05 +09:00
grep.c grep: improve errors for unmatched ( and ) 2024-03-25 11:40:53 -07:00
grep.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
hash-lookup.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
hash-lookup.h
hash.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
hashmap.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
hashmap.h hash-ll, hashmap: move oidhash() to hash-ll 2023-06-21 13:39:54 -07:00
help.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
help.h builtin/merge: fix leaking struct cmdnames in get_strategy() 2024-06-11 13:15:07 -07:00
hex-ll.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex-ll.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
hex.h hex: guard declarations with USE_THE_REPOSITORY_VARIABLE 2024-06-14 10:26:35 -07:00
hook.c Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42 2024-05-24 16:57:43 -07:00
hook.h __attribute__: mark some functions with LAST_ARG_MUST_BE_NULL 2024-06-10 09:16:30 -07:00
http-backend.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
http-fetch.c http-fetch: don't crash when parsing packfile without a repo 2024-06-14 10:26:34 -07:00
http-push.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
http-walker.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
http.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
http.h http: add support for authtype and credential 2024-04-16 22:39:07 -07:00
ident.c ident: add casts for fallback name and GECOS 2024-06-07 10:30:51 -07:00
ident.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
imap-send.c Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -07:00
INSTALL Sync with 2.42.2 2024-04-19 12:38:50 +02:00
iterator.h
json-writer.c strbuf: introduce strbuf_addstrings() to repeatedly add a string 2024-05-29 09:09:39 -07:00
json-writer.h doc: switch links to https 2023-11-26 10:07:05 +09:00
khash.h hash-ll, hashmap: move oidhash() to hash-ll 2023-06-21 13:39:54 -07:00
kwset.c doc: switch links to https 2023-11-26 10:07:05 +09:00
kwset.h doc: switch links to https 2023-11-26 10:07:05 +09:00
levenshtein.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
levenshtein.h
LGPL-2.1
line-log.c line-log: always allocate the output prefix 2024-06-07 10:30:51 -07:00
line-log.h line-log.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
line-range.c line-range: plug leaking find functions 2024-06-11 13:15:08 -07:00
line-range.h
linear-assignment.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
linear-assignment.h
list-objects-filter-options.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
list-objects-filter-options.h list-objects-filter-options.h: remove unneccessary include 2023-06-21 13:39:53 -07:00
list-objects-filter.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
list-objects-filter.h
list-objects.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
list-objects.h
list.h doc: switch links to https 2023-11-26 10:07:05 +09:00
lockfile.c treewide: remove unnecessary includes of cache.h 2023-03-21 10:56:53 -07:00
lockfile.h lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
log-tree.c merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
log-tree.h format-patch: return an allocated string from log_write_email_headers() 2024-03-19 17:54:16 -07:00
loose.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
loose.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
ls-refs.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
ls-refs.h
mailinfo.c Merge branch 'jk/mailinfo-iterative-unquote-comment' into maint-2.43 2024-02-08 16:22:03 -08:00
mailinfo.h
mailmap.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
mailmap.h config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
Makefile Merge branch 'tb/pseudo-merge-reachability-bitmap' 2024-06-24 16:39:13 -07:00
match-trees.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
match-trees.h match-trees.h: move declarations for match-trees.c functions from cache.h 2023-04-24 12:47:32 -07:00
mem-pool.c don't report vsnprintf(3) error as bug 2024-04-21 12:27:07 -07:00
mem-pool.h __attribute__: add a few missing format attributes 2024-06-10 09:16:30 -07:00
merge-blobs.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
merge-blobs.h
merge-ll.c global: convert intentionally-leaking config strings to consts 2024-06-07 10:30:48 -07:00
merge-ll.h merge options: add a conflict style member 2024-03-14 10:08:52 -07:00
merge-ort-wrappers.c merge: fix leaking merge bases 2024-06-11 13:15:08 -07:00
merge-ort-wrappers.h merge: fix leaking merge bases 2024-06-11 13:15:08 -07:00
merge-ort.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
merge-ort.h Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
merge-recursive.c merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
merge-recursive.h merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
merge.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
merge.h merge.h: move declarations for merge.c from cache.h 2023-06-21 13:39:53 -07:00
mergesort.h
midx-write.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
midx.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
midx.h midx: replace get_midx_rev_filename() with a generic helper 2024-05-30 13:43:52 -07:00
name-hash.c name-hash: add index_dir_find() 2024-02-26 15:34:01 -08:00
name-hash.h name-hash: add index_dir_find() 2024-02-26 15:34:01 -08:00
notes-cache.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
notes-cache.h
notes-merge.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
notes-merge.h
notes-utils.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
notes-utils.h commit: fix leaking parents when calling commit_tree_extended() 2024-06-11 13:15:07 -07:00
notes.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
notes.h revision: fix leaking display notes 2024-06-11 13:15:05 -07:00
object-file-convert.c hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
object-file-convert.h object-file-convert: stubs for converting from one object format to another 2023-10-02 14:57:38 -07:00
object-file.c Merge branch 'ew/object-convert-leakfix' 2024-07-02 09:59:01 -07:00
object-file.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
object-name.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
object-name.h object-name: free leaking object contexts 2024-06-11 13:15:05 -07:00
object-store-ll.h object-file: add a compat_oid_in parameter to write_object_file_flags 2023-10-02 14:57:39 -07:00
object-store.h packfile.c: prevent overflow in load_idx() 2023-07-14 09:31:34 -07:00
object.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
object.h Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
oid-array.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
oid-array.h
oidmap.c hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
oidmap.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
oidset.c oidset: pass hash algorithm when parsing file 2024-06-14 10:26:34 -07:00
oidset.h oidset: pass hash algorithm when parsing file 2024-06-14 10:26:34 -07:00
oidtree.c global: ensure that object IDs are always padded 2024-06-14 10:26:32 -07:00
oidtree.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
pack-bitmap-write.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
pack-bitmap.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
pack-bitmap.h pseudo-merge: implement support for finding existing merges 2024-05-24 11:40:44 -07:00
pack-check.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
pack-mtimes.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
pack-mtimes.h treewide: remove unnecessary git-compat-util.h includes in headers 2023-02-23 17:25:28 -08:00
pack-objects.c pack-objects: free packing_data in more places 2023-12-14 14:38:07 -08:00
pack-objects.h pack-objects: free packing_data in more places 2023-12-14 14:38:07 -08:00
pack-revindex.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
pack-revindex.h pack-revindex: implement midx_pair_to_pack_pos() 2023-12-14 14:38:08 -08:00
pack-write.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
pack.h csum-file.h: remove unnecessary inclusion of cache.h 2023-03-21 10:56:55 -07:00
packfile.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
packfile.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
pager.c Merge branch 'rj/pager-die-upon-exec-failure' 2024-07-08 14:53:08 -07:00
pager.h pager.h: move declarations for pager.c functions from cache.h 2023-04-11 08:52:10 -07:00
parallel-checkout.c global: ensure that object IDs are always padded 2024-06-14 10:26:32 -07:00
parallel-checkout.h
parse-options-cb.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
parse-options.c parse-options: rearrange long_name matching code 2024-03-03 09:49:22 -08:00
parse-options.h parse-options: cast long name for OPTION_ALIAS 2024-06-07 10:30:53 -07:00
parse.c config: introduce git_config_double() 2024-05-24 11:40:42 -07:00
parse.h config: introduce git_config_double() 2024-05-24 11:40:42 -07:00
patch-delta.c
patch-ids.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
patch-ids.h patch-id: use stable patch-id for rebases 2022-10-24 15:44:19 -07:00
path.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
path.h Merge branch 'jc/worktree-git-path' 2024-06-24 16:39:15 -07:00
pathspec.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
pathspec.h Merge branch 'jk/log-follow-with-non-literal-pathspec' 2023-06-20 15:53:13 -07:00
pkt-line.c Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43 2024-02-08 16:22:11 -08:00
pkt-line.h Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43 2024-02-08 16:22:11 -08:00
preload-index.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
preload-index.h preload-index.h: move declarations for preload-index.c from elsewhere 2023-06-21 13:39:53 -07:00
pretty.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
pretty.h Merge branch 'rs/date-mode-pass-by-value' 2024-04-16 14:50:29 -07:00
prio-queue.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
prio-queue.h
progress.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
progress.h
promisor-remote.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
promisor-remote.h config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
prompt.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
prompt.h
protocol-caps.c protocol-caps: use hash algorithm from passed-in repository 2024-06-14 10:26:34 -07:00
protocol-caps.h
protocol.c treewide: remove unnecessary cache.h inclusion 2023-04-11 08:52:09 -07:00
protocol.h doc: switch links to https 2023-11-26 10:07:05 +09:00
prune-packed.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
prune-packed.h
pseudo-merge.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
pseudo-merge.h pseudo-merge: implement support for finding existing merges 2024-05-24 11:40:44 -07:00
quote.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
quote.h mailmap, quote: move declarations of global vars to correct unit 2023-04-11 08:52:11 -07:00
range-diff.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
range-diff.h format-patch: run range-diff with larger creation-factor 2024-05-06 11:57:22 -07:00
reachable.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
reachable.h
read-cache-ll.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
read-cache.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
read-cache.h read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
README.md git-gui: note the new maintainer 2024-05-11 17:22:17 +02:00
rebase-interactive.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
rebase-interactive.h rebase -i: pass struct replay_opts to parse_insn_line() 2024-05-30 10:02:56 -07:00
rebase.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
rebase.h
ref-filter.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
ref-filter.h ref-filter: properly distinuish pseudo and root refs 2024-05-15 07:30:52 -07:00
reflog-walk.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
reflog-walk.h date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
reflog.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
reflog.h
refs.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
refs.h Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
refspec.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
refspec.h refspec: remove global tag refspec structure 2024-06-07 10:30:49 -07:00
RelNotes More post 2.45.2 updates from the 'master' front 2024-06-28 15:53:19 -07:00
remote-curl.c Merge branch 'jk/remote-wo-url' 2024-07-02 09:59:01 -07:00
remote.c Merge branch 'jk/remote-wo-url' 2024-07-02 09:59:01 -07:00
remote.h Merge branch 'jk/remote-wo-url' 2024-07-02 09:59:01 -07:00
replace-object.c replace-object: use hash algorithm from passed-in repository 2024-06-14 10:26:34 -07:00
replace-object.h Merge branch 'en/header-split-cache-h-part-3' 2023-06-29 16:43:21 -07:00
repo-settings.c Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
repository.c Merge branch 'ps/ref-storage-migration' 2024-06-17 15:55:55 -07:00
repository.h Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
rerere.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
rerere.h Merge branch 'en/header-split-cleanup' 2023-04-06 13:38:31 -07:00
reset.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
reset.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
resolve-undo.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
resolve-undo.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
revision.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
revision.h revision: optionally record matches with pathspec elements 2024-04-03 14:55:21 -07:00
run-command.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
run-command.h run-command: introduce function to prepare auto-maintenance process 2024-04-17 08:42:26 -07:00
sane-ctype.h sane-ctype.h: create header for sane-ctype macros 2023-07-05 11:41:18 -07:00
scalar.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
SECURITY.md
send-pack.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
send-pack.h
sequencer.c merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
sequencer.h Merge branch 'pw/rebase-i-error-message' into maint-2.45 2024-07-02 09:27:56 -07:00
serve.c hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
serve.h
server-info.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
server-info.h server-info.h: move declarations for server-info.c functions from cache.h 2023-04-24 12:47:31 -07:00
setup.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
setup.h refs: convert ref storage format to an enum 2024-06-06 09:04:31 -07:00
sh-i18n--envsubst.c doc: switch links to https 2023-11-26 10:07:05 +09:00
sha1dc_git.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
sha1dc_git.h Makefile & test-tool: replace "DC_SHA1" variable with a "define" 2022-11-07 22:11:51 -05:00
shallow.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
shallow.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
shared.mak Makefile: simplify output of the libpath_template 2024-01-31 14:43:00 -08:00
shell.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
shortlog.h shortlog: extract shortlog_finish_setup() 2022-10-24 14:48:05 -07:00
sideband.c sideband: avoid short write(2) 2024-03-02 11:12:16 -08:00
sideband.h
sigchain.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
sigchain.h
simple-ipc.h
sparse-index.c sparse-index: improve lstat caching of sparse paths 2024-06-28 12:32:12 -07:00
sparse-index.h sparse-index.h: move declarations for sparse-index.c from cache.h 2023-06-21 13:39:53 -07:00
split-index.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
split-index.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
stable-qsort.c
statinfo.c Merge branch 'jc/fake-lstat' 2023-12-27 14:52:24 -08:00
statinfo.h cache: add fake_lstat() 2023-09-15 17:08:46 -07:00
strbuf.c Merge branch 'gt/t-hash-unit-test' 2024-06-12 13:37:15 -07:00
strbuf.h strbuf: introduce strbuf_addstrings() to repeatedly add a string 2024-05-29 09:09:39 -07:00
streaming.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
streaming.h treewide: remove unnecessary cache.h inclusion from a few headers 2023-03-21 10:56:50 -07:00
string-list.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
string-list.h string-list: introduce string_list_setlen() 2023-04-24 16:01:28 -07:00
strmap.c
strmap.h
strvec.c strvec: add functions to replace and remove strings 2024-05-27 11:20:02 -07:00
strvec.h strvec: add functions to replace and remove strings 2024-05-27 11:20:02 -07:00
sub-process.c treewide: ensure one of the appropriate headers is sourced first 2023-02-23 17:25:28 -08:00
sub-process.h treewide: remove unnecessary git-compat-util.h includes in headers 2023-02-23 17:25:28 -08:00
submodule-config.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
submodule-config.h Merge branch 'vd/fsck-submodule-url-test' 2024-01-26 08:54:47 -08:00
submodule.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
submodule.h Sync with 2.39.4 2024-04-19 12:38:37 +02:00
symlinks.c symlinks.h: move declarations for symlinks.c functions from cache.h 2023-04-24 12:47:31 -07:00
symlinks.h symlinks.h: move declarations for symlinks.c functions from cache.h 2023-04-24 12:47:31 -07:00
tag.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
tag.h refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
tar.h
tempfile.c lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
tempfile.h lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
thread-utils.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
thread-utils.h
tmp-objdir.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
tmp-objdir.h replace and remove run_command_v_opt_cd_env() 2022-10-30 14:04:47 -04:00
trace2.c trace2: emit 'def_param' set with 'cmd_name' event 2024-03-07 10:24:34 -08:00
trace2.h __attribute__: trace2_region_enter_printf() is like "printf" 2024-06-10 09:16:19 -07:00
trace.c doc: switch links to https 2023-11-26 10:07:05 +09:00
trace.h Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
trailer.c global: improve const correctness when assigning string constants 2024-06-07 10:30:48 -07:00
trailer.h Merge branch 'la/hide-trailer-info' 2024-05-23 11:04:27 -07:00
transport-helper.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
transport-internal.h clone: request the 'bundle-uri' command when available 2022-12-25 16:24:23 +09:00
transport.c Merge branch 'xx/bundie-uri-fixes' 2024-07-08 14:53:11 -07:00
transport.h treewide: remove unnecessary cache.h inclusion from a few headers 2023-03-21 10:56:50 -07:00
tree-diff.c hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
tree-walk.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
tree-walk.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
tree.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
tree.h read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
unicode-width.h unicode: update the width tables to Unicode 15.1 2023-09-25 16:17:28 -07:00
unimplemented.sh
unix-socket.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
unix-socket.h
unix-stream-server.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
unix-stream-server.h
unpack-trees.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
unpack-trees.h tree-walk: drop MAX_TRAVERSE_TREES macro 2023-08-31 15:51:07 -07:00
upload-pack.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
upload-pack.h
url.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
url.h
urlmatch.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
urlmatch.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
usage.c usage: report vsnprintf(3) failure 2024-04-05 15:16:27 -07:00
userdiff.c Merge branch 'rs/diff-exit-code-with-external-diff' 2024-06-20 15:45:08 -07:00
userdiff.h Merge branch 'rs/diff-exit-code-with-external-diff' 2024-06-20 15:45:08 -07:00
utf8.c doc: switch links to https 2023-11-26 10:07:05 +09:00
utf8.h doc: switch links to https 2023-11-26 10:07:05 +09:00
varint.c
varint.h
version.c
version.h
versioncmp.c git-compat-util: move strbuf.c funcs to its header 2023-07-05 11:41:18 -07:00
versioncmp.h versioncmp.h: move declarations for versioncmp.c functions from cache.h 2023-04-24 12:47:32 -07:00
walker.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
walker.h
wildmatch.c Merge branch 'pw/wildmatch-fixes' 2023-04-04 14:28:27 -07:00
wildmatch.h wildmatch: hide internal return values 2023-03-20 10:58:53 -07:00
worktree.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
worktree.h Merge branch 'jc/worktree-git-path' 2024-06-24 16:39:15 -07:00
wrap-for-bin.sh
wrapper.c don't report vsnprintf(3) error as bug 2024-04-21 12:27:07 -07:00
wrapper.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
write-or-die.c write-or-die: fix the polarity of GIT_FLUSH environment variable 2024-02-13 11:57:28 -08:00
write-or-die.h write-or-die.h: move declarations for write-or-die.c functions from cache.h 2023-03-21 10:56:54 -07:00
ws.c Merge branch 'jc/attr-source-tree' 2023-05-17 10:11:41 -07:00
ws.h ws.h: move declarations for ws.c functions from cache.h 2023-04-24 12:47:32 -07:00
wt-status.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
wt-status.h status: unify parsing of --untracked= and status.showUntrackedFiles 2024-03-13 10:43:32 -07:00
xdiff-interface.c global: introduce USE_THE_REPOSITORY_VARIABLE macro 2024-06-14 10:26:33 -07:00
xdiff-interface.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00

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