Go to file
Junio C Hamano 17381ab62a Merge branch 'bl/cherry-pick-empty'
Allow git-cherry-pick(1) to automatically drop redundant commits via
a new `--empty` option, similar to the `--empty` options for
git-rebase(1) and git-am(1). Includes a soft deprecation of
`--keep-redundant-commits` as well as some related docs changes and
sequencer code cleanup.

* bl/cherry-pick-empty:
  cherry-pick: add `--empty` for more robust redundant commit handling
  cherry-pick: enforce `--keep-redundant-commits` incompatibility
  sequencer: do not require `allow_empty` for redundant commit options
  sequencer: handle unborn branch with `--allow-empty`
  rebase: update `--empty=ask` to `--empty=stop`
  docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)
  docs: address inaccurate `--empty` default with `--exec`
2024-04-03 10:56:20 -07:00
.github Merge branch 'pb/ci-win-artifact-names-fix' 2024-03-21 14:55:13 -07:00
Documentation Merge branch 'bl/cherry-pick-empty' 2024-04-03 10:56:20 -07:00
block-sha1
builtin Merge branch 'bl/cherry-pick-empty' 2024-04-03 10:56:20 -07:00
ci fuzz: add fuzzer for config parsing 2024-03-15 10:47:05 -07:00
compat
contrib Merge branch 'jk/drop-hg-to-git' 2024-03-28 14:13:51 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
oss-fuzz fuzz: add fuzzer for config parsing 2024-03-15 10:47:05 -07:00
perl
po
refs Merge branch 'ps/reftable-reflog-iteration-perf' 2024-03-21 14:55:13 -07:00
reftable Merge branch 'ps/reftable-unit-test-nfs-workaround' 2024-04-01 13:21:35 -07:00
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
t Merge branch 'bl/cherry-pick-empty' 2024-04-03 10:56:20 -07:00
templates
trace2
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitlab-ci.yml
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN
INSTALL
LGPL-2.1
Makefile Merge branch 'bt/fuzz-config-parse' 2024-03-28 14:13:51 -07:00
README.md
RelNotes
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c
advice.c sequencer: allow disabling conflict advice 2024-03-18 09:28:40 -07:00
advice.h sequencer: allow disabling conflict advice 2024-03-18 09:28:40 -07:00
alias.c
alias.h
alloc.c
alloc.h
apply.c
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.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c
branch.h
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 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
commit.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
common-main.c
config.c Merge branch 'ds/config-internal-whitespace-fix' 2024-04-01 13:21:34 -07: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
csum-file.h
ctype.c
daemon.c
date.c
date.h
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 Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c diff: add diff.srcPrefix and diff.dstPrefix configuration variables 2024-03-15 10:04:45 -07:00
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
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.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
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-quiltimport: avoid an unnecessary subshell 2024-03-16 11:08:57 -07:00
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 'jh/trace2-missing-def-param-fix' 2024-03-18 13:04:25 -07:00
git.rc
gpg-interface.c
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.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
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 'jk/pretty-subject-cleanup' 2024-04-01 13:21:34 -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
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.c midx: use strvec_pushf() for pack-objects base name 2024-03-25 12:03:27 -07: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 '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 Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
pack-bitmap.c
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
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
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c Merge branch 'bl/pretty-shorthand-config-fix' 2024-04-03 10:56:20 -07:00
pretty.h format-patch: return an allocated string from log_write_email_headers() 2024-03-19 17:54:16 -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
quote.c
quote.h
range-diff.c
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
rebase.h
ref-filter.c Merge branch 'la/trailer-api' 2024-03-14 14:05:24 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
reflog.h
refs.c
refs.h
refspec.c
refspec.h
remote-curl.c transport-helper: drop "object-format <algo>" option 2024-03-20 10:01:27 -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
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
run-command.c
run-command.h
sane-ctype.h
scalar.c
send-pack.c
send-pack.h
sequencer.c Merge branch 'bl/cherry-pick-empty' 2024-04-03 10:56:20 -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 factor out strbuf_expand_bad_format() 2024-03-25 11:59:24 -07:00
strbuf.h factor out strbuf_expand_bad_format() 2024-03-25 11:59:24 -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/trailer-api' 2024-03-14 14:05:24 -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
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
wrapper.h
write-or-die.c
write-or-die.h
ws.c
ws.h
wt-status.c Merge branch 'fs/find-end-of-log-message-fix' 2024-03-21 14:55:12 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h

README.md

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