Go to file

Philippe Blain 00536761df git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool In git-mergetool--lib.sh::get_merge_tool_path, we check if the chosen tool is valid via valid_tool and exit with an error message if not. This error message mentions "Unknown merge tool", even if the command the user tried was 'git difftool --tool=unknown'. Use the global 'TOOL_MODE' variable for a more correct error message. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2024-11-25 11:59:19 +09:00
.github	ci: create script to set up Git for Windows SDK	2024-10-09 11:33:04 -07:00
Documentation	The ninth batch	2024-11-13 08:35:34 +09:00
block-sha1	sha1: do not redefine `platform_SHA_CTX` and friends	2024-09-27 11:27:47 -07:00
builtin	Merge branch 'en/shallow-exclude-takes-a-ref-fix'	2024-11-13 08:35:32 +09:00
ci	Merge branch 'ss/duplicate-typos'	2024-11-01 12:53:23 -04:00
compat	Merge branch 'ps/mingw-rename'	2024-11-13 08:35:34 +09:00
contrib	completion: complete '--tool-help' in 'git mergetool'	2024-11-25 11:59:18 +09:00
ewah	…
git-gui	Merge https://github.com/j6t/git-gui	2024-11-11 12:47:44 +09:00
gitk-git	…
gitweb	…
mergetools	Merge branch 'ak/typofix-2.46-maint'	2024-10-04 14:21:40 -07:00
negotiator	…
oss-fuzz	…
perl	Merge branch 'ak/typofix-2.46-maint'	2024-10-04 14:21:40 -07:00
po	Merge branch 'l10n-de-2.47' of github.com:ralfth/git	2024-10-06 12:06:21 +08:00
refs	global: Fix duplicate word typos	2024-10-21 16:05:04 -04:00
reftable	reftable: handle trivial `reftable_buf` errors	2024-10-17 16:59:56 -04:00
sha1	sha1: do not redefine `platform_SHA_CTX` and friends	2024-09-27 11:27:47 -07:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	Merge branch 'ps/mingw-rename'	2024-11-13 08:35:34 +09:00
templates	…
trace2	Merge branch 'ak/typofix-2.46-maint'	2024-10-04 14:21:40 -07:00
xdiff	…
.cirrus.yml	…
.clang-format	clang-format: align consecutive macro definitions	2024-10-18 17:37:16 -04:00
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitlab-ci.yml	gitlab-ci: exercise Git on Windows	2024-10-09 11:33:05 -07:00
.gitmodules	…
.mailmap	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Start the 2.48 cycle	2024-10-10 14:22:30 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'ps/upgrade-clar'	2024-11-08 12:56:28 +09:00
README.md	…
RelNotes	Start the 2.48 cycle	2024-10-10 14:22:30 -07:00
SECURITY.md	…
abspath.c	…
abspath.h	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	…
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'ps/apply-leakfix'	2024-09-25 10:37:10 -07:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	Merge branch 'rs/archive-with-attr-pathspec-fix'	2024-10-04 14:21:40 -07:00
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	diff: improve lifecycle management of diff queues	2024-09-30 11:23:05 -07:00
bloom.h	…
branch.c	submodule: fix leaking submodule entry list	2024-09-30 11:23:03 -07:00
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle-uri.c	bundle-uri: plug leak in unbundle_from_file()	2024-10-10 11:47:24 -07:00
bundle-uri.h	…
bundle.c	…
bundle.h	…
cache-tree.c	Merge branch 'ps/cache-tree-w-broken-index-entry'	2024-10-22 14:40:38 -04:00
cache-tree.h	cache-tree: refactor verification to return error codes	2024-10-07 15:08:11 -07:00
cbtree.c	…
cbtree.h	…
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
checkout.c	…
checkout.h	…
chunk-format.c	…
chunk-format.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	combine-diff: fix leaking lost lines	2024-11-04 22:37:55 -08:00
command-list.txt	…
commit-graph.c	…
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	…
commit.h	…
common-main.c	…
config.c	…
config.h	…
config.mak.dev	Merge branch 'ak/typofix-2.46-maint'	2024-09-25 10:37:12 -07:00
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	…
connect.h	…
connected.c	packfile: use object_id in find_pack_entry_one()	2024-10-25 17:35:46 -04:00
connected.h	…
convert.c	…
convert.h	…
copy.c	…
copy.h	…
credential.c	Merge branch 'ds/background-maintenance-with-credential'	2024-09-30 16:16:16 -07:00
credential.h	…
csum-file.c	csum-file.c: use unsafe SHA-1 implementation when available	2024-09-27 11:27:47 -07:00
csum-file.h	…
ctype.c	…
daemon.c	daemon: replace atoi() with strtoul_ui() and strtol_i()	2024-10-24 14:03:43 -04:00
date.c	…
date.h	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diagnose.c	…
diagnose.h	…
diff-delta.c	…
diff-lib.c	diff-lib: fix leaking diffopts in `do_diff_cache()`	2024-11-04 22:37:52 -08:00
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	Merge branch 'jk/output-prefix-cleanup'	2024-10-10 14:22:30 -07:00
diff.h	Merge branch 'jk/output-prefix-cleanup'	2024-10-10 14:22:30 -07:00
diffcore-break.c	diff: improve lifecycle management of diff queues	2024-09-30 11:23:05 -07:00
diffcore-delta.c	…
diffcore-order.c	diffcore-order: fix leaking buffer when parsing orderfiles	2024-09-27 08:25:35 -07:00
diffcore-pickaxe.c	diff: improve lifecycle management of diff queues	2024-09-30 11:23:05 -07:00
diffcore-rename.c	diff: improve lifecycle management of diff queues	2024-09-30 11:23:05 -07:00
diffcore-rotate.c	diff: improve lifecycle management of diff queues	2024-09-30 11:23:05 -07:00
diffcore.h	diff: improve lifecycle management of diff queues	2024-09-30 11:23:05 -07:00
dir-iterator.c	…
dir-iterator.h	…
dir.c	dir: fix leak when parsing "status.showUntrackedFiles"	2024-11-04 22:37:56 -08:00
dir.h	…
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: die if in commit graph but not obj db	2024-11-05 18:57:22 -08:00
fetch-pack.h	…
fmt-merge-msg.c	…
fmt-merge-msg.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	global: Fix duplicate word typos	2024-10-21 16:05:04 -04:00
fsmonitor.h	…
generate-cmdlist.sh	…
generate-configlist.sh	…
generate-hooklist.sh	…
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--lib.sh: use TOOL_MODE when erroring about unknown tool	2024-11-25 11:59:19 +09:00
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.h	…
git.c	Merge branch 'jc/a-commands-without-the-repo'	2024-10-25 14:02:36 -04:00
git.rc	…
gpg-interface.c	Merge branch 'ak/typofix-2.46-maint'	2024-09-25 10:37:12 -07:00
gpg-interface.h	…
graph.c	Merge branch 'jk/output-prefix-cleanup'	2024-10-10 14:22:30 -07:00
graph.h	…
grep.c	Merge branch 'ps/leakfixes-part-9'	2024-11-13 08:35:31 +09:00
grep.h	…
hash-lookup.c	…
hash-lookup.h	…
hash.h	hash.h: set NEEDS_CLONE_HELPER_UNSAFE in fallback mode	2024-10-03 11:18:36 -07:00
hashmap.c	…
hashmap.h	…
help.c	…
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	packfile: convert find_sha1_pack() to use object_id	2024-10-25 17:35:46 -04:00
http-walker.c	packfile: convert find_sha1_pack() to use object_id	2024-10-25 17:35:46 -04:00
http.c	Merge branch 'jk/dumb-http-finalize'	2024-11-01 12:53:32 -04:00
http.h	http: fix leak of http_object_request struct	2024-09-25 10:24:55 -07:00
ident.c	…
ident.h	…
imap-send.c	imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing	2024-10-24 14:03:44 -04:00
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	Merge branch 'jk/output-prefix-cleanup'	2024-10-10 14:22:30 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	list-objects-filter-options: work around reported leak on error	2024-11-04 22:37:57 -08:00
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	Merge branch 'ng/rebase-merges-branch-name-as-label'	2024-10-18 13:56:22 -04:00
log-tree.h	rebase-update-refs: extract load_branch_decorations	2024-10-09 10:52:45 -07:00
loose.c	loose: don't rely on repository global state	2024-10-09 11:51:31 -07:00
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: replace atoi() with strtol_i() for marker size validation	2024-10-24 14:03:44 -04:00
merge-ll.h	…
merge-ort-wrappers.c	…
merge-ort-wrappers.h	…
merge-ort.c	diff: improve lifecycle management of diff queues	2024-09-30 11:23:05 -07:00
merge-ort.h	…
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
merge.h	…
mergesort.h	…
midx-write.c	pack-write: fix return parameter of `write_rev_file_order()`	2024-09-30 11:23:08 -07:00
midx.c	packfile: use object_id in find_pack_entry_one()	2024-10-25 17:35:46 -04: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	Merge branch 'tb/weak-sha1-for-tail-sum'	2024-10-02 07:46:27 -07:00
object-file.h	finalize_object_file(): implement collision check	2024-09-27 11:27:47 -07:00
object-name.c	…
object-name.h	…
object-store-ll.h	…
object-store.h	…
object.c	…
object.h	…
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
oidtree.c	global: Fix duplicate word typos	2024-10-21 16:05:04 -04:00
oidtree.h	…
pack-bitmap-write.c	pack-bitmap-write: fix leaking OID array	2024-09-30 11:23:07 -07:00
pack-bitmap.c	packfile: use object_id in find_pack_entry_one()	2024-10-25 17:35:46 -04:00
pack-bitmap.h	…
pack-check.c	…
pack-mtimes.c	…
pack-mtimes.h	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	Merge branch 'ps/leakfixes-part-8'	2024-10-10 14:22:29 -07:00
pack.h	pack-write: fix return parameter of `write_rev_file_order()`	2024-09-30 11:23:08 -07:00
packfile.c	packfile: use oidread() instead of hashcpy() to fill object_id	2024-10-25 17:35:46 -04:00
packfile.h	packfile: use object_id in find_pack_entry_one()	2024-10-25 17:35:46 -04:00
pager.c	…
pager.h	…
parallel-checkout.c	…
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	parse-options: free previous value of `OPTION_FILENAME`	2024-09-27 08:25:35 -07:00
parse-options.h	…
parse.c	…
parse.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	…
preload-index.h	…
pretty.c	pretty: clear signature check	2024-11-04 22:37:53 -08:00
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
promisor-remote.c	promisor-remote: fix leaking partial clone filter	2024-09-27 08:25:36 -07:00
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: fix leaking strmap keys	2024-09-30 11:23:06 -07:00
pseudo-merge.h	pseudo-merge: fix various memory leaks	2024-09-30 11:23:06 -07:00
quote.c	…
quote.h	…
range-diff.c	Merge branch 'jk/output-prefix-cleanup'	2024-10-10 14:22:30 -07:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache-ll.h	global: Fix duplicate word typos	2024-10-21 16:05:04 -04:00
read-cache.c	Merge branch 'ps/cache-tree-w-broken-index-entry'	2024-10-22 14:40:38 -04:00
read-cache.h	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	ref-filter: format iteratively with lexicographic refname sorting	2024-10-21 16:46:03 -04:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
reflog.c	…
reflog.h	…
refs.c	Merge branch 'ps/reftable-exclude'	2024-09-25 10:37:11 -07:00
refs.h	Merge branch 'ak/typofix-2.46-maint'	2024-09-25 10:37:12 -07:00
refspec.c	…
refspec.h	…
remote-curl.c	remote-curl: free HEAD ref with free_one_ref()	2024-09-25 10:24:56 -07:00
remote.c	Merge branch 'xx/remote-server-option-config'	2024-10-15 16:56:43 -04:00
remote.h	Merge branch 'xx/remote-server-option-config'	2024-10-15 16:56:43 -04:00
replace-object.c	…
replace-object.h	…
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: fix leaking bloom filters	2024-11-04 22:37:52 -08:00
revision.h	…
run-command.c	…
run-command.h	…
sane-ctype.h	…
scalar.c	Merge branch 'ps/leakfixes-part-8'	2024-10-10 14:22:29 -07:00
send-pack.c	…
send-pack.h	…
sequencer.c	rebase-merges: try and use branch names as labels	2024-10-09 10:52:46 -07:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
server-info.h	…
setup.c	worktree: link worktrees with relative paths	2024-10-08 11:49:22 -07:00
setup.h	…
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	sha1: do not redefine `platform_SHA_CTX` and friends	2024-09-27 11:27:47 -07:00
shallow.c	…
shallow.h	…
shared.mak	…
shell.c	shell: fix leaking strings	2024-09-30 11:23:03 -07:00
shortlog.h	…
sideband.c	Merge branch 'ak/typofix-2.46-maint'	2024-09-25 10:37:12 -07:00
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	simple-ipc: split async server initialization and running	2024-10-08 12:03:56 -07:00
sparse-index.c	sparse-index: correctly free EWAH contents	2024-11-04 22:37:56 -08:00
sparse-index.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
statinfo.c	…
statinfo.h	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.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: fix leaking submodule entry list	2024-09-30 11:23:03 -07:00
submodule-config.h	submodule: fix leaking submodule entry list	2024-09-30 11:23:03 -07:00
submodule.c	Merge branch 'ps/leakfixes-part-7'	2024-10-02 07:46:26 -07:00
submodule.h	submodule: fix leaking update strategy	2024-09-27 08:25:34 -07:00
symlinks.c	…
symlinks.h	…
tag.c	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	Merge branch 'tb/weak-sha1-for-tail-sum'	2024-10-02 07:46:27 -07:00
tmp-objdir.h	…
trace.c	…
trace.h	…
trace2.c	…
trace2.h	…
trailer.c	trailer: fix leaking strbufs when formatting trailers	2024-11-04 22:37:54 -08:00
trailer.h	…
transport-helper.c	transport-helper: fix leaking import/export marks	2024-11-04 22:37:54 -08:00
transport-internal.h	…
transport.c	transport.c:🤝 make use of server options from remote	2024-10-08 10:22:08 -07:00
transport.h	transport: introduce parse_transport_option() method	2024-10-08 10:22:06 -07: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	…
unix-stream-server.c	…
unix-stream-server.h	…
unpack-trees.c	unpack-trees: detect mismatching number of cache-tree/index entries	2024-10-07 15:08:11 -07:00
unpack-trees.h	…
upload-pack.c	Merge branch 'en/shallow-exclude-takes-a-ref-fix'	2024-11-13 08:35:32 +09:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	utf8.h: squelch unused-parameter warnings with NO_ICONV	2024-10-02 15:52:48 -07:00
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
versioncmp.h	…
walker.c	http-walker: use object_id instead of bare hash	2024-10-25 17:35:46 -04:00
walker.h	http-walker: use object_id instead of bare hash	2024-10-25 17:35:46 -04:00
wildmatch.c	…
wildmatch.h	…
worktree.c	worktree: link worktrees with relative paths	2024-10-08 11:49:22 -07:00
worktree.h	worktree: link worktrees with relative paths	2024-10-08 11:49:22 -07:00
wrap-for-bin.sh	…
wrapper.c	…
wrapper.h	…
write-or-die.c	…
write-or-die.h	…
ws.c	…
ws.h	…
wt-status.c	wt-status: fix leaking buffer with sparse directories	2024-09-30 11:23:03 -07:00
wt-status.h	…
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.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