Go to file

Taylor Blau 89f47c45df pseudo-merge.ch: initial commit Add a new (empty) header file to contain the implementation for selecting, reading, and applying pseudo-merge bitmaps. For now this header and its corresponding implementation are left empty, but they will evolve over the course of subsequent commit(s). Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2024-05-24 11:40:41 -07:00
.github	Merge branch 'pb/ci-win-artifact-names-fix'	2024-03-21 14:55:13 -07:00
Documentation	Documentation/technical: describe pseudo-merge bitmaps format	2024-05-24 11:40:41 -07:00
block-sha1	…
builtin	pack-bitmap: move some initialization to `bitmap_writer_init()`	2024-05-24 11:40:41 -07:00
ci	…
compat	Win32: detect unix socket support at runtime	2024-04-03 14:54:28 -07:00
contrib	Merge branch 'ba/osxkeychain-updates'	2024-04-16 14:50:30 -07:00
ewah	ewah: implement `ewah_bitmap_is_subset()`	2024-05-24 11:40:41 -07:00
git-gui	Makefile(s): do not enforce "all indents must be done with tab"	2024-04-08 16:36:05 -07:00
gitk-git	Makefile(s): avoid recipe prefix in conditional statements	2024-04-08 14:42:32 -07:00
gitweb	…
mergetools	…
negotiator	…
oss-fuzz	Merge branch 'rs/date-mode-pass-by-value'	2024-04-16 14:50:29 -07:00
perl	…
po	Merge branch 'master' of github.com:alshopov/git-po	2024-04-29 14:50:23 +08:00
refs	Merge branch 'ps/pack-refs-auto'	2024-04-09 14:31:45 -07:00
reftable	Merge branch 'ps/reftable-block-iteration-optim'	2024-04-23 11:52:37 -07:00
sha1	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	Merge branch 'rj/add-i-leak-fix'	2024-04-25 10:34:24 -07:00
templates	…
trace2	…
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	editorconfig: add Makefiles to "text files"	2024-03-23 11:42:31 -07:00
.gitattributes	…
.gitignore	…
.gitlab-ci.yml	…
.gitmodules	…
.mailmap	mailmap: change primary address for Linus Arver	2024-04-16 22:25:11 -07:00
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.45	2024-04-29 07:30:29 -07:00
INSTALL	INSTALL: bump libcurl version to 7.21.3	2024-04-02 13:27:20 -07:00
LGPL-2.1	…
Makefile	pseudo-merge.ch: initial commit	2024-05-24 11:40:41 -07:00
README.md	…
RelNotes	…
SECURITY.md	…
abspath.c	…
abspath.h	…
aclocal.m4	…
add-interactive.c	add-interactive: plug a leak in get_untracked_files	2024-04-22 16:27:42 -07:00
add-interactive.h	…
add-patch.c	add-patch: plug a leak handling the '/' command	2024-04-22 16:27:42 -07:00
advice.c	Merge branch 'jc/advice-sans-trailing-whitespace'	2024-04-09 14:31:43 -07:00
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'rj/add-i-leak-fix'	2024-04-25 10:34:24 -07:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
archive.h	…
attr.c	…
attr.h	…
banned.h	…
base85.c	…
base85.h	…
bisect.c	bisect: report the found commit with "show"	2024-04-15 11:29:09 -07:00
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	Merge branch 'pf/commitish-committish'	2024-04-19 09:13:47 -07:00
branch.h	typo: replace 'commitish' with 'committish'	2024-04-11 15:14:56 -07:00
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle-uri.c	…
bundle-uri.h	…
bundle.c	…
bundle.h	…
cache-tree.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
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	…
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	Merge branch 'jk/core-comment-string'	2024-04-05 10:49:49 -07:00
commit.h	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
common-main.c	…
config.c	Merge branch 'jc/unleak-core-excludesfile'	2024-04-15 14:11:44 -07:00
config.h	…
config.mak.dev	…
config.mak.in	…
config.mak.uname	Merge branch 'tb/make-indent-conditional-with-non-spaces'	2024-04-16 14:50:29 -07:00
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	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	date: make DATE_MODE thread-safe	2024-04-05 15:21:14 -07:00
date.h	date: make DATE_MODE thread-safe	2024-04-05 15:21:14 -07:00
decorate.c	…
decorate.h	…
delta-islands.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
delta-islands.h	…
delta.h	…
detect-compiler	…
diagnose.c	…
diagnose.h	…
diff-delta.c	…
diff-lib.c	revision: optionally record matches with pathspec elements	2024-04-03 14:55:21 -07:00
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	…
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore-rotate.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	…
dir.h	…
editor.c	launch_editor: waiting message on error	2024-04-15 10:13:32 -07:00
editor.h	…
entry.c	…
entry.h	…
environment.c	Merge branch 'jk/core-comment-string'	2024-04-05 10:49:49 -07:00
environment.h	Merge branch 'jk/core-comment-string'	2024-04-05 10:49:49 -07:00
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	…
fsck.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
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	…
gettext.c	…
gettext.h	…
git-archimport.perl	…
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-05 14:45:19 -07:00
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.h	…
git.c	…
git.rc	…
gpg-interface.c	Merge branch 'rs/date-mode-pass-by-value'	2024-04-16 14:50:29 -07:00
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	grep: improve errors for unmatched ( and )	2024-03-25 11:40:53 -07:00
grep.h	…
hash-ll.h	…
hash-lookup.c	…
hash-lookup.h	…
hash.h	…
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	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
http-walker.c	…
http.c	http: reset POSTFIELDSIZE when clearing curl handle	2024-04-02 13:27:18 -07:00
http.h	…
ident.c	…
ident.h	…
imap-send.c	imap-send: increase command size limit	2024-04-15 11:34:17 -07:00
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	…
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	…
list-objects-filter-options.h	…
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
list-objects.h	…
list.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'rs/date-mode-pass-by-value'	2024-04-16 14:50:29 -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	…
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	don't report vsnprintf(3) error as bug	2024-04-21 12:27:07 -07:00
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-ll.c	Merge branch 'pw/checkout-conflict-errorfix'	2024-04-01 13:21:33 -07:00
merge-ll.h	…
merge-ort-wrappers.c	…
merge-ort-wrappers.h	…
merge-ort.c	Merge branch 'pw/checkout-conflict-errorfix'	2024-04-01 13:21:33 -07:00
merge-ort.h	…
merge-recursive.c	Merge branch 'pw/checkout-conflict-errorfix'	2024-04-01 13:21:33 -07:00
merge-recursive.h	…
merge.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
merge.h	…
mergesort.h	…
midx-write.c	pack-bitmap: move some initialization to `bitmap_writer_init()`	2024-05-24 11:40:41 -07:00
midx.c	Merge branch 'ps/missing-btmp-fix'	2024-04-23 11:52:40 -07:00
midx.h	midx-write: move writing-related functions from midx.c	2024-04-01 14:18:16 -07:00
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 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
object-file.h	…
object-name.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
object-name.h	…
object-store-ll.h	…
object-store.h	…
object.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
object.h	object.h: add flags allocated by pack-bitmap.h	2024-05-15 06:52:31 -07:00
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
oidtree.c	…
oidtree.h	…
pack-bitmap-write.c	pack-bitmap: move some initialization to `bitmap_writer_init()`	2024-05-24 11:40:41 -07:00
pack-bitmap.c	Merge branch 'ps/missing-btmp-fix'	2024-04-23 11:52:40 -07:00
pack-bitmap.h	pack-bitmap: move some initialization to `bitmap_writer_init()`	2024-05-24 11:40:41 -07:00
pack-check.c	…
pack-mtimes.c	…
pack-mtimes.h	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
packfile.h	…
pager.c	…
pager.h	…
parallel-checkout.c	…
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
parse.c	…
parse.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'rs/apply-lift-path-length-limit'	2024-04-15 14:11:42 -07:00
path.h	Merge branch 'rs/apply-lift-path-length-limit'	2024-04-15 14:11:42 -07:00
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
preload-index.h	…
pretty.c	Merge branch 'rs/date-mode-pass-by-value'	2024-04-16 14:50:29 -07:00
pretty.h	Merge branch 'rs/date-mode-pass-by-value'	2024-04-16 14:50:29 -07:00
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.ch: initial commit	2024-05-24 11:40:41 -07:00
pseudo-merge.h	pseudo-merge.ch: initial commit	2024-05-24 11:40:41 -07:00
quote.c	…
quote.h	…
range-diff.c	…
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache-ll.h	revision: optionally record matches with pathspec elements	2024-04-03 14:55:21 -07:00
read-cache.c	revision: optionally record matches with pathspec elements	2024-04-03 14:55:21 -07:00
read-cache.h	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	date: make DATE_MODE thread-safe	2024-04-05 15:21:14 -07:00
ref-filter.h	…
reflog-walk.c	date: make DATE_MODE thread-safe	2024-04-05 15:21:14 -07:00
reflog-walk.h	date: make DATE_MODE thread-safe	2024-04-05 15:21:14 -07:00
reflog.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
reflog.h	…
refs.c	…
refs.h	refs/reftable: expose auto compaction via new flag	2024-03-25 09:54:07 -07:00
refspec.c	…
refspec.h	…
remote-curl.c	Merge branch 'jk/libcurl-8.7-regression-workaround'	2024-04-15 14:11:44 -07:00
remote.c	…
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repository.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
repository.h	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
rerere.c	Merge branch 'mr/rerere-crash-fix'	2024-04-23 11:52:41 -07:00
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
revision.h	revision: optionally record matches with pathspec elements	2024-04-03 14:55:21 -07:00
run-command.c	run-command: introduce function to prepare auto-maintenance process	2024-04-17 08:42:26 -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	…
scalar.c	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'jk/core-comment-string'	2024-04-05 10:49:49 -07:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
server-info.h	…
setup.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
setup.h	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shared.mak	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	…
sparse-index.c	…
sparse-index.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
statinfo.c	…
statinfo.h	…
strbuf.c	don't report vsnprintf(3) error as bug	2024-04-21 12:27:07 -07:00
strbuf.h	Merge branch 'jk/core-comment-string'	2024-04-05 10:49:49 -07:00
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	…
trace2.h	…
trailer.c	Merge branch 'la/format-trailer-info'	2024-04-23 11:52:39 -07:00
trailer.h	…
transport-helper.c	Merge branch 'jk/remote-helper-object-format-option-fix'	2024-04-03 10:56:18 -07:00
transport-internal.h	…
transport.c	…
transport.h	…
tree-diff.c	…
tree-walk.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
tree-walk.h	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
tree.c	Merge branch 'eb/hash-transition'	2024-03-28 14:13:50 -07:00
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.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	usage: report vsnprintf(3) failure	2024-04-05 15:16:27 -07:00
userdiff.c	userdiff: better method/property matching for C#	2024-04-05 15:21:43 -07:00
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
versioncmp.h	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	…
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	don't report vsnprintf(3) error as bug	2024-04-21 12:27:07 -07:00
wrapper.h	…
write-or-die.c	…
write-or-die.h	…
ws.c	…
ws.h	…
wt-status.c	Merge branch 'jk/core-comment-string'	2024-04-05 10:49:49 -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