Go to file

Elijah Newren 22d99f012f replay: add --advance or 'cherry-pick' mode There is already a 'rebase' mode with `--onto`. Let's add an 'advance' or 'cherry-pick' mode with `--advance`. This new mode will make the target branch advance as we replay commits onto it. The replayed commits should have a single tip, so that it's clear where the target branch should be advanced. If they have more than one tip, this new mode will error out. Co-authored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2023-11-26 10:10:49 +09:00
.github	Merge branch 'jk/ci-retire-allow-ref' into maint-2.42	2023-11-02 16:53:23 +09:00
Documentation	replay: add --advance or 'cherry-pick' mode	2023-11-26 10:10:49 +09:00
block-sha1	…
builtin	replay: add --advance or 'cherry-pick' mode	2023-11-26 10:10:49 +09:00
ci	Merge branch 'jk/ci-retire-allow-ref' into maint-2.42	2023-11-02 16:53:23 +09:00
compat	Merge branch 'jk/fsmonitor-unused-parameter'	2023-09-29 09:04:14 -07:00
contrib	Merge branch 'pb/completion-aliases-doc' into maint-2.42	2023-11-02 16:53:19 +09:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
negotiator	…
oss-fuzz	…
perl	…
po	doc: correct the 50 characters soft limit (+)	2023-10-09 12:07:26 -07:00
refs	files-backend.c: avoid stat in 'loose_fill_ref_dir'	2023-10-09 15:53:14 -07:00
reftable	…
sha1	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	replay: add --advance or 'cherry-pick' mode	2023-11-26 10:10:49 +09:00
templates	…
trace2	…
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	replay: introduce new builtin	2023-11-26 10:10:48 +09:00
.gitmodules	…
.mailmap	mailmap: change primary address for Derrick Stolee	2023-10-12 10:59:36 -07:00
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.42.1	2023-11-02 17:09:48 +09:00
INSTALL	…
LGPL-2.1	…
Makefile	replay: introduce new builtin	2023-11-26 10:10:48 +09:00
README.md	…
RelNotes	Git 2.42.1	2023-11-02 16:59:16 +09: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	…
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
attr.c	Merge branch 'jc/attr-tree-config'	2023-10-30 07:09:55 +09:00
attr.h	attr: add attr.tree for setting the treeish to read attributes from	2023-10-13 11:43:29 -07:00
banned.h	…
base85.c	…
base85.h	…
bisect.c	…
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
bloom.c	commit-graph: detect out-of-order BIDX offsets	2023-10-09 15:55:02 -07:00
bloom.h	…
branch.c	…
branch.h	…
builtin.h	replay: introduce new builtin	2023-11-26 10:10:48 +09:00
bulk-checkin.c	Merge branch 'eb/limit-bulk-checkin-to-blobs'	2023-10-10 11:39:14 -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	…
bundle-uri.h	…
bundle.c	…
bundle.h	…
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: drop pair_chunk_unsafe()	2023-10-09 15:55:02 -07:00
chunk-format.h	chunk-format: drop pair_chunk_unsafe()	2023-10-09 15:55:02 -07:00
color.c	hex-ll: separate out non-hash-algo functions	2023-09-29 15:14:56 -07:00
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	replay: introduce new builtin	2023-11-26 10:10:48 +09:00
commit-graph.c	Merge branch 'jk/chunk-bounds'	2023-10-23 13:56:36 -07:00
commit-graph.h	commit-graph: check bounds when accessing BDAT chunk	2023-10-09 15:55:01 -07:00
commit-reach.c	commit-reach: free temporary list in get_octopus_merge_bases()	2023-10-03 14:28:23 -07:00
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	…
commit.h	…
common-main.c	…
config.c	Merge branch 'jc/attr-tree-config'	2023-10-30 07:09:55 +09:00
config.h	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
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	…
csum-file.h	…
ctype.c	…
daemon.c	daemon: free listen_addr before returning	2023-10-05 14:54:58 -07:00
date.c	…
date.h	…
decorate.c	decorate: add clear_decoration() function	2023-10-05 14:54:55 -07:00
decorate.h	decorate: add clear_decoration() function	2023-10-05 14:54:55 -07:00
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diagnose.c	dir.[ch]: add 'follow_symlink' arg to 'get_dtype'	2023-10-09 15:53:13 -07:00
diagnose.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'js/diff-cached-fsmonitor-fix' into maint-2.42	2023-11-02 16:53:19 +09:00
diff-merges.c	diff-merges: introduce '--dd' option	2023-10-09 12:47:29 -07:00
diff-merges.h	…
diff-no-index.c	Merge branch 'pw/diff-no-index-from-named-pipes' into maint-2.42	2023-11-02 16:53:18 +09:00
diff.c	Merge branch 'jk/diff-result-code-cleanup' into maint-2.42	2023-11-02 16:53:16 +09:00
diff.h	diff --stat: set the width defaults in a helper function	2023-09-29 15:46:06 -07: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	dir.[ch]: add 'follow_symlink' arg to 'get_dtype'	2023-10-09 15:53:13 -07:00
dir.h	dir.[ch]: add 'follow_symlink' arg to 'get_dtype'	2023-10-09 15:53:13 -07:00
editor.c	…
editor.h	…
entry.c	wrapper: reduce scope of remove_or_warn()	2023-09-29 15:14:56 -07:00
entry.h	wrapper: reduce scope of remove_or_warn()	2023-09-29 15:14:56 -07:00
environment.c	…
environment.h	…
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	Merge branch 'ts/unpacklimit-config-fix' into maint-2.42	2023-11-02 16:53:16 +09:00
fetch-pack.h	…
fmt-merge-msg.c	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor--daemon.h	doc: fix some typos, grammar and wording issues	2023-10-05 12:55:38 -07:00
fsmonitor-ipc.c	fsmonitor: mark unused parameters in stub functions	2023-09-18 15:56:15 -07:00
fsmonitor-ipc.h	…
fsmonitor-ll.h	…
fsmonitor-path-utils.h	…
fsmonitor-settings.c	fsmonitor: mark some maybe-unused parameters	2023-09-18 15:56:14 -07:00
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 'mp/rebase-label-length-limit' into maint-2.42	2023-11-02 16:53:14 +09:00
git-curl-compat.h	…
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	…
git-mergetool.sh	…
git-p4.py	git-p4 shouldn't attempt to store symlinks in LFS	2023-10-19 10:57:44 -07:00
git-quiltimport.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'jk/send-email-fix-addresses-from-composed-messages'	2023-10-30 07:09:59 +09:00
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	replay: introduce new builtin	2023-11-26 10:10:48 +09:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
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: 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	hex-ll: separate out non-hash-algo functions	2023-09-29 15:14:56 -07:00
hex.h	hex-ll: separate out non-hash-algo functions	2023-09-29 15:14:56 -07:00
hook.c	…
hook.h	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	Merge branch 'jk/redact-h2h3-headers-fix' into maint-2.42	2023-11-02 16:53:19 +09:00
http.h	…
ident.c	…
ident.h	…
imap-send.c	…
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	revision: clear decoration structs during release_revisions()	2023-10-05 14:54:57 -07:00
line-log.h	revision: clear decoration structs during release_revisions()	2023-10-05 14:54:57 -07:00
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	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	hex-ll: separate out non-hash-algo functions	2023-09-29 15:14:56 -07:00
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 branch 'wx/merge-ort-comment-typofix' into maint-2.42	2023-11-02 16:53:27 +09:00
merge-ort.h	…
merge-recursive.c	merge: introduce {copy\|clear}_merge_options()	2023-10-11 13:37:47 -07:00
merge-recursive.h	merge: introduce {copy\|clear}_merge_options()	2023-10-11 13:37:47 -07:00
merge.c	…
merge.h	…
mergesort.h	…
midx.c	midx: check size of revindex chunk	2023-10-09 15:55:01 -07:00
midx.h	midx: check size of revindex chunk	2023-10-09 15:55:01 -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.c	bulk-checkin: only support blobs in index_bulk_checkin	2023-09-26 10:17:56 -07: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-write: rebuild using new bitmap when remapping	2023-10-02 14:54:30 -07:00
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	…
pack-mtimes.c	…
pack-mtimes.h	…
pack-objects.c	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
pack-objects.h	…
pack-revindex.c	Merge branch 'jk/chunk-bounds'	2023-10-23 13:56:36 -07:00
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	…
packfile.h	…
pager.c	…
pager.h	…
parallel-checkout.c	…
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
parse-options.h	parse-options: drop unused parse_opt_ctx_t member	2023-10-03 13:15:03 -07:00
parse.c	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
parse.h	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	grep: die gracefully when outside repository	2023-10-20 11:06:45 -07:00
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
preload-index.h	…
pretty.c	pretty: fix ref filtering for %(decorate) formats	2023-10-09 11:25:13 -07:00
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
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.h	…
protocol.c	…
protocol.h	…
prune-packed.c	…
prune-packed.h	…
quote.c	…
quote.h	…
range-diff.c	Merge branch 'kh/range-diff-notes'	2023-09-29 09:04:15 -07:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache-ll.h	…
read-cache.c	…
read-cache.h	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
rebase.h	…
ref-filter.c	ref-filter: add mailmap support	2023-09-25 14:52:34 -07:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
reflog.c	…
reflog.h	…
refs.c	…
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	…
remote.c	…
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repository.c	…
repository.h	…
rerere.c	Merge branch 'jc/unresolve-removal'	2023-10-02 11:20:00 -07:00
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	Merge branch 'jc/unresolve-removal'	2023-10-02 11:20:00 -07:00
resolve-undo.h	…
revision.c	Merge branch 'jk/decoration-and-other-leak-fixes'	2023-10-13 14:18:28 -07:00
revision.h	range-diff: treat notes like `log`	2023-09-19 14:40:19 -07:00
run-command.c	…
run-command.h	…
sane-ctype.h	…
scalar.c	Merge branch 'ds/scalar-updates' into maint-2.42	2023-11-02 16:53:15 +09:00
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'ob/sequencer-remove-dead-code' into maint-2.42	2023-11-02 16:53:24 +09:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
server-info.h	…
setup.c	Merge branch 'ds/scalar-updates' into maint-2.42	2023-11-02 16:53:15 +09:00
setup.h	Merge branch 'ds/scalar-updates' into maint-2.42	2023-11-02 16:53:15 +09: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	Prevent git from rehashing 4GiB files	2023-10-13 13:33:35 -07:00
statinfo.h	…
strbuf.c	hex-ll: separate out non-hash-algo functions	2023-09-29 15:14:56 -07:00
strbuf.h	doc: fix some typos, grammar and wording issues	2023-10-05 12:55:38 -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	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	…
transport.h	…
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
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	…
unix-socket.h	…
unix-stream-server.c	…
unix-stream-server.h	…
unpack-trees.c	Merge branch 'cw/prelim-cleanup'	2023-10-10 11:39:14 -07:00
unpack-trees.h	…
upload-pack.c	Merge branch 'ds/upload-pack-error-sequence-fix' into maint-2.42	2023-11-02 16:53:20 +09: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	…
usage.c	…
userdiff.c	…
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	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
wrapper.h	wrapper: reduce scope of remove_or_warn()	2023-09-29 15:14:56 -07:00
write-or-die.c	parse: separate out parsing functions from config.h	2023-09-29 15:14:57 -07:00
write-or-die.h	…
ws.c	…
ws.h	…
wt-status.c	Merge branch 'jk/diff-result-code-cleanup' into maint-2.42	2023-11-02 16:53:16 +09: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 with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). The mailing list archives are available at https://lore.kernel.org/git/, http://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