Go to file

Justin Tobler 5bd10b2adc builtin: introduce diff-pairs command Through git-diff(1), a single diff can be generated from a pair of blob revisions directly. Unfortunately, there is not a mechanism to compute batches of specific file pair diffs in a single process. Such a feature is particularly useful on the server-side where diffing between a large set of changes is not feasible all at once due to timeout concerns. To facilitate this, introduce git-diff-pairs(1) which acts as a backend passing its NUL-terminated raw diff format input from stdin through diff machinery to produce various forms of output such as patch or raw. The raw format was originally designed as an interchange format and represents the contents of the diff_queued_diff list making it possible to break the diff pipeline into separate stages. For example, git-diff-tree(1) can be used as a frontend to compute file pairs to queue and feed its raw output to git-diff-pairs(1) to compute patches. With this, batches of diffs can be progressively generated without having to recompute renames or retrieve object context. Something like the following: git diff-tree -r -z -M $old $new \| git diff-pairs -p -z should generate the same output as `git diff-tree -p -M`. Furthermore, each line of raw diff formatted input can also be individually fed to a separate git-diff-pairs(1) process and still produce the same output. Based-on-patch-by: Jeff King <peff@peff.net> Signed-off-by: Justin Tobler <jltobler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2025-03-03 08:17:47 -08:00
.github	Merge branch 'jk/ci-coverity-update'	2025-02-10 10:18:31 -08:00
Documentation	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
bin-wrappers	…
block-sha1	…
builtin	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
ci	Merge branch 'ps/zlib-ng'	2025-02-06 14:56:45 -08:00
compat	compat/mingw: rename the symlink, not the target	2025-02-21 10:24:43 -08:00
contrib	Merge branch 'ad/set-default-target-in-makefiles'	2025-02-25 14:19:36 -08:00
ewah	…
git-gui	Merge branch 'ad/set-default-target-in-makefiles'	2025-02-25 14:19:36 -08:00
gitk-git	Merge branch 'master' of https://github.com/j6t/gitk	2025-02-20 05:59:56 -08:00
gitweb	…
mergetools	…
negotiator	…
oss-fuzz	Merge branch 'ps/build-meson-fixes'	2025-02-03 10:23:34 -08:00
perl	…
po	gitk: introduce support for the Meson build system	2025-02-20 08:52:15 +01:00
refs	Merge branch 'kn/reflog-migration-fix-followup'	2025-02-14 17:53:48 -08:00
reftable	Merge branch 'kn/reflog-migration-fix-followup'	2025-02-14 17:53:48 -08:00
sha1	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
subprojects	…
t	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
templates	Makefile: set default goals in makefiles	2025-02-18 09:02:26 -08:00
trace2	global: adapt callers to use generic hash context helpers	2025-01-31 10:06:11 -08:00
xdiff	xdiff: avoid signed vs. unsigned comparisons in xutils.c	2025-02-12 09:41:17 -08:00
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	Remove obsolete ".txt" extensions for AsciiDoc files	2025-01-21 12:56:10 -08:00
.gitignore	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
.gitlab-ci.yml	Merge branch 'jt/gitlab-ci-base-fix'	2025-02-10 10:18:30 -08:00
.gitmodules	…
.mailmap	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-BUILD-OPTIONS.in	Merge branch 'ps/3.0-remote-deprecation'	2025-02-03 10:23:33 -08:00
GIT-VERSION-FILE.in	…
GIT-VERSION-GEN	Git 2.49-rc0	2025-02-26 08:55:18 -08:00
INSTALL	…
LGPL-2.1	…
Makefile	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
README.md	…
RelNotes	…
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 'pw/apply-ulong-overflow-check'	2025-02-10 10:18:30 -08:00
apply.h	…
archive-tar.c	compat/zlib: provide stubs for `deflateSetHeader()`	2025-01-28 13:03:23 -08:00
archive-zip.c	…
archive.c	git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"	2025-01-28 13:03:22 -08: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	…
bloom.h	…
branch.c	…
branch.h	…
builtin.h	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
bulk-checkin.c	Merge branch 'ps/hash-cleanup'	2025-02-10 10:18:31 -08:00
bulk-checkin.h	…
bundle-uri.c	…
bundle-uri.h	…
bundle.c	bundle: avoid closing file descriptor twice	2025-01-25 18:38:11 -08:00
bundle.h	bundle: avoid closing file descriptor twice	2025-01-25 18:38:11 -08:00
cache-tree.c	…
cache-tree.h	…
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	…
command-list.txt	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
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-exit.c	common-main: split init and exit code into new files	2025-01-28 14:39:16 -08:00
common-init.c	common-main: split init and exit code into new files	2025-01-28 14:39:16 -08:00
common-init.h	common-main: split init and exit code into new files	2025-01-28 14:39:16 -08:00
common-main.c	common-main: split init and exit code into new files	2025-01-28 14:39:16 -08:00
config.c	git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"	2025-01-28 13:03:22 -08:00
config.h	…
config.mak.dev	…
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
copy.h	…
credential.c	…
credential.h	…
csum-file.c	Merge branch 'ps/hash-cleanup'	2025-02-10 10:18:31 -08:00
csum-file.h	hash: stop typedeffing the hash context	2025-01-31 10:06:10 -08:00
ctype.c	…
daemon.c	…
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-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	diff: add option to skip resolving diff statuses	2025-03-03 08:17:47 -08:00
diff.h	diff: add option to skip resolving diff statuses	2025-03-03 08:17:47 -08: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	backfill: add --sparse option	2025-02-03 16:12:42 -08:00
dir.h	backfill: add --sparse option	2025-02-03 16:12:42 -08:00
editor.c	…
editor.h	…
entry.c	…
entry.h	…
environment.c	git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"	2025-01-28 13:03:22 -08:00
environment.h	…
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	Merge branch 'kn/pack-write-with-reduced-globals'	2025-02-03 10:23:34 -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	…
fsmonitor.h	…
generate-cmdlist.sh	…
generate-configlist.sh	…
generate-hooklist.sh	…
generate-perl.sh	…
generate-python.sh	…
generate-script.sh	…
gettext.c	…
gettext.h	…
git-archimport.perl	…
git-compat-util.h	Merge branch 'ps/zlib-ng'	2025-02-06 14:56:45 -08: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: cast away potential constness of `next_in` pointer	2025-01-28 13:03:23 -08:00
git-zlib.h	git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"	2025-01-28 13:03:22 -08:00
git.c	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
git.rc.in	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash-lookup.c	…
hash-lookup.h	…
hash.h	hash: provide generic wrappers to update hash contexts	2025-01-31 10:06:11 -08:00
hashmap.c	…
hashmap.h	…
help.c	help: add "show" as a valid configuration value	2025-02-03 15:22:05 -08: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	global: adapt callers to use generic hash context helpers	2025-01-31 10:06:11 -08:00
http-walker.c	…
http.c	global: adapt callers to use generic hash context helpers	2025-01-31 10:06:11 -08:00
http.h	hash: stop typedeffing the hash context	2025-01-31 10:06:10 -08:00
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.h	…
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
merge.h	…
mergesort.h	…
meson.build	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
meson_options.txt	Merge branch 'ps/zlib-ng'	2025-02-06 14:56:45 -08:00
midx-write.c	Merge branch 'kn/pack-write-with-reduced-globals'	2025-02-03 10:23:34 -08:00
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	Merge branch 'tb/unsafe-hash-cleanup'	2025-02-03 10:23:32 -08:00
object-file.h	…
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	…
oidtree.h	…
pack-bitmap-write.c	…
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	global: adapt callers to use generic hash context helpers	2025-01-31 10:06:11 -08:00
pack-mtimes.c	…
pack-mtimes.h	…
pack-objects.c	…
pack-objects.h	Merge branch 'ds/name-hash-tweaks'	2025-02-12 10:08:51 -08:00
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	Merge branch 'ps/hash-cleanup'	2025-02-10 10:18:31 -08:00
pack.h	Merge branch 'kn/pack-write-with-reduced-globals'	2025-02-03 10:23:34 -08:00
packfile.c	Merge branch 'jk/pack-header-parse-alignment-fix'	2025-01-28 13:02:23 -08:00
packfile.h	Merge branch 'jk/pack-header-parse-alignment-fix'	2025-01-28 13:02:23 -08:00
pager.c	…
pager.h	…
parallel-checkout.c	…
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	Merge branch 'jc/show-usage-help'	2025-01-28 13:02:22 -08:00
parse-options.h	parse-options: introduce die_for_incompatible_opt2()	2025-02-06 12:23:54 -08:00
parse.c	…
parse.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path-walk.c	backfill: add --sparse option	2025-02-03 16:12:42 -08:00
path-walk.h	backfill: add --sparse option	2025-02-03 16:12:42 -08:00
path.c	…
path.h	…
pathspec.c	…
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	…
read-cache.c	global: adapt callers to use generic hash context helpers	2025-01-31 10:06:11 -08:00
read-cache.h	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'rs/ref-fitler-used-atoms-value-fix'	2025-01-29 14:05:09 -08:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
reflog.c	…
reflog.h	…
refs.c	Merge branch 'kn/reflog-migration-fix-followup'	2025-02-14 17:53:48 -08:00
refs.h	refs: mark `ref_transaction_update_reflog()` as static	2025-01-22 09:51:35 -08:00
refspec.c	refspec: clarify function naming and documentation	2025-02-18 09:44:27 -08:00
refspec.h	refspec: clarify function naming and documentation	2025-02-18 09:44:27 -08:00
remote-curl.c	…
remote.c	refspec: clarify function naming and documentation	2025-02-18 09:44:27 -08:00
remote.h	Merge branch 'tc/clone-single-revision'	2025-02-14 17:53:48 -08:00
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repo-settings.h	…
repository.c	…
repository.h	…
rerere.c	global: adapt callers to use generic hash context helpers	2025-01-31 10:06:11 -08:00
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	…
run-command.c	…
run-command.h	…
sane-ctype.h	…
scalar.c	Merge branch 'ps/leakfixes-0129'	2025-02-06 14:56:45 -08:00
send-pack.c	send-pack: gracefully close the connection for atomic push	2025-02-03 15:24:58 -08:00
send-pack.h	send-pack: new return code "ERROR_SEND_PACK_BAD_REF_STATUS"	2025-02-03 15:24:57 -08:00
sequencer.c	…
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
server-info.h	…
setup.c	setup: fix reinit of repos with incompatible GIT_DEFAULT_HASH	2025-01-30 14:36:41 -08:00
setup.h	…
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	…
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-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	Merge branch 'am/trace2-with-valueless-true'	2025-01-29 14:05:10 -08:00
trace2.h	…
trailer.c	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	Merge branch 'ps/send-pack-unhide-error-in-atomic-push'	2025-02-18 15:30:32 -08:00
transport.h	…
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	Merge branch 'ps/leakfixes-0129'	2025-02-06 14:56:45 -08:00
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.h	…
urlmatch.c	…
urlmatch.h	…
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: detect from secondary worktree if main worktree is bare	2025-02-05 09:46:23 -08:00
worktree.h	…
wrapper.c	…
wrapper.h	…
write-or-die.c	…
write-or-die.h	…
ws.c	…
ws.h	…
wt-status.c	…
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