Go to file

Paolo Bonzini f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch When "git am --show-current-patch" was added in commit `984913a210` ("am: add --show-current-patch", 2018-02-12), "git am" started recommending it as a replacement for .git/rebase-merge/patch. Unfortunately the suggestion is somewhat misguided; for example, the output "git am --show-current-patch" cannot be passed to "git apply" if it is encoded as quoted-printable or base64. To simplify worktree operations and to avoid that users poke into .git, it would be better if "git am" also provided a mode that copies .git/rebase-merge/patch to stdout. One possibility could be to have completely separate options, introducing for example --show-current-message (for .git/rebase-apply/NNNN) and --show-current-diff (for .git/rebase-apply/patch), while possibly deprecating --show-current-patch. That would even remove the need for the first two patches in the series. However, the long common prefix would have prevented using an abbreviated option such as "--show". Therefore, I chose instead to add a string argument to --show-current-patch. The new argument is optional, so that "git am --show-current-patch"'s behavior remains backwards-compatible. The next choice to make is how to handle multiple --show-current-patch options. Right now, something like "git am --abort --show-current-patch" is rejected, and the previous suggestion would likewise have naturally rejected a command line like git am --show-current-message --show-current-diff Therefore, I decided to also reject for example git am --show-current-patch=diff --show-current-patch=raw In other words the whole of --show-current-patch=xxx (including the optional argument) is treated as the command mode. I found this to be more consistent and intuitive, even though it differs from the usual "last one wins" semantics of the git command line. Add the code to parse submodes based on the above design, where for now "raw" is the only valid submode. "raw" prints the full e-mail message just like "git am --show-current-patch". Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2020-02-20 13:20:40 -08:00
.github	…
Documentation	am: support --show-current-patch=raw as a synonym for--show-current-patch	2020-02-20 13:20:40 -08:00
block-sha1	…
builtin	am: support --show-current-patch=raw as a synonym for--show-current-patch	2020-02-20 13:20:40 -08:00
ci	Merge branch 'sg/osx-force-gcc-9'	2019-12-06 15:09:21 -08:00
compat	Merge branch 'js/mingw-reserved-filenames'	2020-01-02 12:38:30 -08:00
contrib	am: support --show-current-patch=raw as a synonym for--show-current-patch	2020-02-20 13:20:40 -08:00
ewah	…
git-gui	Merge https://github.com/prati0100/git-gui	2020-01-08 11:18:06 -08:00
gitk-git	Merge gitk to pick up emergency build fix	2019-09-17 14:59:18 -07:00
gitweb	Merge branch 'do/gitweb-typofix-in-comments'	2020-01-08 12:44:11 -08:00
mergetools	…
negotiator	…
perl	Fix spelling errors in documentation outside of Documentation/	2019-11-07 13:42:00 +09:00
po	l10n: zh_CN: for git v2.25.0 l10n round 1	2020-01-12 19:22:02 +08:00
ppc	…
refs	refs: pass NULL to refs_read_ref_full() because object ID is not needed	2019-12-11 13:48:42 -08:00
sha1collisiondetection@855827c583	…
sha1dc	Merge branch 'jk/lore-is-the-archive'	2019-12-06 15:09:23 -08:00
sha256	…
t	am: support --show-current-patch=raw as a synonym for--show-current-patch	2020-02-20 13:20:40 -08:00
templates	Merge branch 'kw/fsmonitor-watchman-fix'	2019-12-01 09:04:33 -08:00
trace2	Merge branch 'en/doc-typofix'	2019-12-01 09:04:35 -08:00
vcs-svn	…
xdiff	Merge branch 'rs/xdiff-ignore-ws-w-func-context'	2019-12-16 13:08:32 -08:00
.cirrus.yml	CI: add FreeBSD CI support via Cirrus-CI	2019-12-20 12:09:12 -08:00
.clang-format	…
.editorconfig	…
.gitattributes	Fix build with core.autocrlf=true	2019-09-24 19:48:27 +05:30
.gitignore	sparse-checkout: create builtin with 'list' subcommand	2019-11-22 16:11:43 +09:00
.gitmodules	…
.mailmap	mailmap: mask accentless variant for Công Danh	2019-12-26 09:53:09 -08:00
.travis.yml	travis-ci: build with GCC 4.8 as well	2019-07-19 14:06:01 -07:00
.tsan-suppressions	…
CODE_OF_CONDUCT.md	CODE_OF_CONDUCT: mention individual project-leader emails	2019-10-10 10:41:46 +09:00
COPYING	…
GIT-VERSION-GEN	Git 2.25	2020-01-13 10:16:43 -08:00
INSTALL	Merge branch 'ar/install-doc-update-cmds-needing-the-shell'	2019-12-01 09:04:41 -08:00
LGPL-2.1	…
Makefile	Merge branch 'js/add-p-in-c'	2019-12-25 11:22:01 -08:00
README.md	doc: recommend lore.kernel.org over public-inbox.org	2019-11-30 09:12:04 -08:00
RelNotes	Git 2.24.1	2019-12-06 16:31:40 +01:00
abspath.c	…
aclocal.m4	…
add-interactive.c	built-in add -p: implement hunk editing	2019-12-13 12:37:14 -08:00
add-interactive.h	built-in add -p: implement hunk editing	2019-12-13 12:37:14 -08:00
add-patch.c	built-in add -p: show helpful hint when nothing can be staged	2019-12-13 12:37:14 -08:00
advice.c	submodule--helper: advise on fatal alternate error	2019-12-03 08:49:45 -08:00
advice.h	submodule--helper: advise on fatal alternate error	2019-12-03 08:49:45 -08:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'js/add-i-a-bit-more-tests'	2019-12-16 13:08:47 -08:00
apply.h	apply.h: include missing header	2019-09-28 14:04:16 +09:00
archive-tar.c	Merge branch 'rs/pax-extended-header-length-fix'	2019-09-09 12:26:37 -07:00
archive-zip.c	Merge branch 'rs/archive-zip-code-cleanup'	2019-12-16 13:14:47 -08:00
archive.c	…
archive.h	…
argv-array.c	argv-array: add space after `while`	2019-11-20 13:29:02 +09:00
argv-array.h	argv-array: move doc to argv-array.h	2019-11-18 15:21:29 +09:00
attr.c	attr: move doc to attr.h	2019-11-18 15:21:28 +09:00
attr.h	attr: move doc to attr.h	2019-11-18 15:21:28 +09:00
azure-pipelines.yml	Merge branch 'js/azure-pipelines-msvc'	2019-10-23 11:06:46 +09:00
banned.h	banned.h: fix vsprintf()'s ban message	2019-08-26 10:32:45 -07:00
base85.c	…
bisect.c	bisect: switch to using the_hash_algo	2019-08-19 15:04:58 -07:00
bisect.h	…
blame.c	Merge branch 'ew/hashmap'	2019-10-15 13:48:02 +09:00
blame.h	Merge branch 'br/blame-ignore'	2019-07-19 11:30:20 -07:00
blob.c	…
blob.h	…
branch.c	Merge branch 'nd/switch-and-restore'	2019-07-09 15:25:44 -07:00
branch.h	Merge branch 'nd/switch-and-restore'	2019-07-09 15:25:44 -07:00
builtin.h	sparse-checkout: create builtin with 'list' subcommand	2019-11-22 16:11:43 +09:00
bulk-checkin.c	bulk-checkin: zero-initialize hashfile_checkpoint	2019-09-06 11:03:39 -07:00
bulk-checkin.h	…
bundle.c	bundle-create: progress output control	2019-11-11 11:46:28 +09:00
bundle.h	bundle-create: progress output control	2019-11-11 11:46:28 +09:00
cache-tree.c	Merge branch 'en/merge-recursive-cleanup'	2019-10-15 13:47:59 +09:00
cache-tree.h	cache-tree: share code between functions writing an index as a tree	2019-08-19 10:08:03 -07:00
cache.h	Merge branch 'ds/sparse-cone'	2020-01-06 14:17:51 -08:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	column: use utf8_strnwidth() to strip out ANSI color escapes	2019-10-15 10:54:15 +09:00
column.h	…
combine-diff.c	combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo	2019-08-19 15:04:58 -07:00
command-list.txt	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
commit-graph.c	Merge branch 'ds/commit-graph-set-size-mult'	2020-01-06 14:17:51 -08:00
commit-graph.h	upload-pack: disable commit graph more gently for shallow traversal	2019-09-12 12:30:08 -07:00
commit-reach.c	commit-graph: fix writing first commit-graph during fetch	2019-10-25 11:19:16 +09:00
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'jk/cleanup-object-parsing-and-fsck'	2019-12-01 09:04:28 -08:00
commit.h	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
common-main.c	common-main: delay trace2 initialization	2019-08-06 13:09:01 -07:00
config.c	sparse-checkout: add 'cone' mode	2019-11-22 16:11:44 +09:00
config.h	config: move documentation to config.h	2019-10-24 11:14:08 +09:00
config.mak.dev	…
config.mak.in	…
config.mak.uname	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
configure.ac	Merge branch 'dd/sequencer-utf8'	2019-12-01 09:04:36 -08:00
connect.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
connect.h	…
connected.c	clone: remove fetch_if_missing=0	2019-11-13 11:48:47 +09:00
connected.h	…
convert.c	Merge branch 'rs/skip-iprefix'	2019-12-01 09:04:36 -08:00
convert.h	am: reload .gitattributes after patching it	2019-09-03 15:16:18 -07:00
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	credential: move doc to credential.h	2019-11-18 15:21:29 +09:00
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
date.c	date.c: switch to reentrant {gm,local}time_r	2019-11-30 13:50:48 -08:00
decorate.c	…
decorate.h	…
delta-islands.c	Merge branch 'jk/oidhash'	2019-07-09 15:25:43 -07:00
delta-islands.h	…
delta.h	…
detect-compiler	…
diff-delta.c	diff-delta: set size out-parameter to 0 for NULL delta	2019-09-06 11:03:39 -07:00
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'js/builtin-add-i'	2019-12-05 12:52:43 -08:00
diff.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
diffcore-break.c	diffcore-break: use a goto instead of a redundant if statement	2019-10-02 15:04:21 +09:00
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	Merge branch 'ew/hashmap'	2019-10-15 13:48:02 +09:00
diffcore.h	diff: move doc to diff.h and diffcore.h	2019-11-18 15:21:28 +09:00
dir-iterator.c	dir-iterator: add flags parameter to dir_iterator_begin	2019-07-11 13:52:15 -07:00
dir-iterator.h	dir-iterator: add flags parameter to dir_iterator_begin	2019-07-11 13:52:15 -07:00
dir.c	Merge branch 'en/fill-directory-fixes'	2019-12-25 11:22:02 -08:00
dir.h	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
editor.c	…
entry.c	…
environment.c	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
exec-cmd.c	…
exec-cmd.h	…
fast-import.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
fetch-negotiator.c	repo-settings: create feature.experimental setting	2019-08-13 13:33:55 -07:00
fetch-negotiator.h	repo-settings: create feature.experimental setting	2019-08-13 13:33:55 -07:00
fetch-pack.c	Merge branch 'ec/fetch-mark-common-refs-trace2'	2019-12-05 12:52:44 -08:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
fsck.h	fsck: only provide oid/type in fsck_error callback	2019-10-28 14:05:18 +09:00
fsmonitor.c	unpack-trees: skip stat on fsmonitor-valid files	2019-11-21 12:48:18 +09:00
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
gettext.c	Merge branch 'ab/test-env'	2019-07-25 13:59:20 -07:00
gettext.h	…
git-add--interactive.perl	git add -p: use non-zero exit code when the diff generation failed	2019-12-06 08:57:34 -08:00
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	Fix spelling errors in messages shown to users	2019-11-10 16:00:54 +09:00
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	Recommend git-filter-repo instead of git-filter-branch	2019-09-05 13:01:48 -07:00
git-instaweb.sh	…
git-legacy-stash.sh	Merge branch 'js/update-index-ignore-removal-for-skip-worktree'	2019-11-10 18:02:16 +09:00
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	…
git-mergetool.sh	…
git-p4.py	Merge branch 'bk/p4-misc-usability'	2020-01-02 12:38:29 -08:00
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--preserve-merges.sh	rebase: fold git-rebase--common into the -p backend	2019-07-31 12:24:06 -07:00
git-request-pull.sh	…
git-send-email.perl	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	Merge branch 'dl/submodule-set-url'	2019-12-10 13:11:42 -08:00
git-svn.perl	git svn: stop using `rebase --preserve-merges`	2019-11-23 09:49:23 +09:00
git-web--browse.sh	…
git.c	sparse-checkout: create builtin with 'list' subcommand	2019-11-22 16:11:43 +09:00
git.rc	…
gpg-interface.c	gpg-interface: prefer check_signature() for GPG verification	2019-11-30 13:52:35 -08:00
gpg-interface.h	gpg-interface: prefer check_signature() for GPG verification	2019-11-30 13:52:35 -08:00
graph.c	graph: fix lack of color in horizontal lines	2020-01-08 09:37:18 -08:00
graph.h	graph: move doc to graph.h and graph.c	2019-11-18 15:21:28 +09:00
grep.c	grep: don't return an expression from pcre2_free()	2019-11-30 14:06:58 -08:00
grep.h	Merge branch 'cb/pcre2-chartables-leakfix'	2019-10-23 14:43:11 +09:00
hash.h	…
hashmap.c	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
hashmap.h	Merge branch 'en/doc-typofix'	2019-12-01 09:04:35 -08:00
help.c	Fix spelling errors in messages shown to users	2019-11-10 16:00:54 +09:00
help.h	help: make help_unknown_ref() NORETURN	2019-08-30 10:22:42 -07:00
hex.c	hex: drop sha1_to_hex()	2019-11-13 10:09:10 +09:00
http-backend.c	…
http-fetch.c	…
http-push.c	http-push: simplify deleting a list item	2019-10-15 10:53:50 +09:00
http-walker.c	…
http.c	Merge branch 'cb/curl-use-xmalloc'	2019-12-01 09:04:33 -08:00
http.h	http: use xmalloc with cURL	2019-08-15 12:37:10 -07:00
ident.c	…
imap-send.c	…
interdiff.c	…
interdiff.h	…
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	Merge branch 'rs/copy-array' into maint	2019-07-29 12:38:15 -07:00
kwset.h	kset.h, tar.h: add missing header guard to prevent multiple inclusion	2019-11-07 20:12:04 +09:00
levenshtein.c	…
levenshtein.h	…
line-log.c	Merge branch 'sg/line-log-tree-diff-optim'	2019-09-18 11:50:09 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	Merge branch 'jk/partial-clone-sparse-blob'	2019-10-07 11:32:54 +09:00
list-objects-filter-options.h	Merge branch 'jk/partial-clone-sparse-blob'	2019-10-07 11:32:54 +09:00
list-objects-filter.c	Merge branch 'jk/partial-clone-sparse-blob'	2019-10-07 11:32:54 +09:00
list-objects-filter.h	…
list-objects.c	Merge branch 'jk/list-objects-optim-wo-trees'	2019-10-07 11:32:56 +09:00
list-objects.h	…
list.h	…
ll-merge.c	am: reload .gitattributes after patching it	2019-09-03 15:16:18 -07:00
ll-merge.h	merge: move doc to ll-merge.h	2019-11-18 15:21:28 +09:00
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'hi/gpg-use-check-signature'	2019-12-10 13:11:45 -08:00
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'en/merge-recursive-oid-eq-simplify'	2020-01-06 14:17:51 -08:00
merge-recursive.h	hashmap_entry: remove first member requirement from docs	2019-10-07 10:20:12 +09:00
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	midx: honor the MIDX_PROGRESS flag in midx_repack	2019-10-23 12:05:06 +09:00
midx.h	midx: add MIDX_PROGRESS flag	2019-10-23 12:05:05 +09:00
name-hash.c	Merge branch 'en/doc-typofix'	2019-12-01 09:04:35 -08:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
notes.h	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
object-store.h	packfile.c: speed up loading lots of packfiles	2019-12-03 07:59:45 -08:00
object.c	packfile.c: speed up loading lots of packfiles	2019-12-03 07:59:45 -08:00
object.h	commit-graph: fix writing first commit-graph during fetch	2019-10-25 11:19:16 +09:00
oidmap.c	hashmap: introduce hashmap_free_entries	2019-10-07 10:20:11 +09:00
oidmap.h	hashmap: use *_entry APIs for iteration	2019-10-07 10:20:11 +09:00
oidset.c	Merge branch 'br/blame-ignore'	2019-07-19 11:30:20 -07:00
oidset.h	Merge branch 'br/blame-ignore'	2019-07-19 11:30:20 -07:00
pack-bitmap-write.c	pack-objects: drop packlist index_pos optimization	2019-09-06 11:03:42 -07:00
pack-bitmap.c	Merge branch 'jk/misc-uninitialized-fixes'	2019-09-30 13:19:30 +09:00
pack-bitmap.h	pack-bitmap.h: remove magic number	2019-09-28 14:04:20 +09:00
pack-check.c	…
pack-objects.c	Merge branch 'jk/optim-in-pack-idx-conversion'	2019-12-01 09:04:38 -08:00
pack-objects.h	Merge branch 'jk/optim-in-pack-idx-conversion'	2019-12-01 09:04:38 -08:00
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	pack-write: use hash_to_hex when writing checksums	2019-08-19 15:04:58 -07:00
pack.h	…
packfile.c	Merge branch 'ew/packfile-syscall-optim'	2020-01-06 14:17:50 -08:00
packfile.h	Merge branch 'ds/midx-expire-repack'	2019-09-09 12:26:38 -07:00
pager.c	…
parse-options-cb.c	parse-options: avoid arithmetic on pointer that's potentially NULL	2019-11-13 11:44:00 +09:00
parse-options.c	parse-options: convert "command mode" to a flag	2020-02-20 13:20:40 -08:00
parse-options.h	parse-options: convert "command mode" to a flag	2020-02-20 13:20:40 -08:00
patch-delta.c	…
patch-ids.c	hashmap: remove type arg from hashmap_{get,put,remove}_entry	2019-10-07 10:20:12 +09:00
patch-ids.h	…
path.c	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
path.h	path: add a function to check for path suffix	2019-08-26 10:36:13 -07:00
pathspec.c	pathspec: add new function to parse file	2019-11-20 13:01:53 +09:00
pathspec.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
pkt-line.c	…
pkt-line.h	pkt-line: fix a typo	2019-12-02 08:48:56 -08:00
preload-index.c	…
pretty.c	Merge branch 'dl/pretty-reference'	2019-12-10 13:11:43 -08:00
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	progress: create GIT_PROGRESS_DELAY	2019-11-27 10:57:10 +09:00
progress.h	…
promisor-remote.c	promisor-remote: remove fetch_if_missing=0	2019-11-13 11:50:58 +09:00
promisor-remote.h	Merge branch 'dl/honor-cflags-in-hdr-check'	2019-10-07 11:33:02 +09:00
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
quote.c	Merge branch 'gs/sq-quote-buf-pretty'	2019-10-15 13:48:02 +09:00
quote.h	quote: add sq_append_quote_argv_pretty()	2019-08-09 10:48:02 -07:00
range-diff.c	range-diff: mark pointers as const	2019-12-06 12:34:49 -08:00
range-diff.h	Merge branch 'dl/range-diff-with-notes'	2019-12-16 13:08:46 -08:00
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'	2020-01-10 14:45:27 -08:00
rebase-interactive.c	…
rebase-interactive.h	…
ref-filter.c	Merge branch 'ew/hashmap'	2019-10-15 13:48:02 +09:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	hashmap_entry: remove first member requirement from docs	2019-10-07 10:20:12 +09:00
refs.h	refs: move doc to refs.h	2019-11-18 15:21:28 +09:00
refspec.c	…
refspec.h	remote: move doc to remote.h and refspec.h	2019-11-18 15:21:28 +09:00
remote-curl.c	Merge branch 'bc/smart-http-atomic-push'	2019-10-23 14:43:11 +09:00
remote-testsvn.c	…
remote.c	hashmap: remove type arg from hashmap_{get,put,remove}_entry	2019-10-07 10:20:12 +09:00
remote.h	remote: move doc to remote.h and refspec.h	2019-11-18 15:21:28 +09:00
replace-object.c	…
replace-object.h	…
repo-settings.c	Merge branch 'ds/feature-macros'	2019-10-24 13:34:03 +09:00
repository.c	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
repository.h	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
rerere.c	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
revision.h	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
run-command.c	run-command: use prepare_git_cmd() in prepare_cmd()	2019-11-27 11:22:35 +09:00
run-command.h	run-command: move doc to run-command.h	2019-11-18 15:21:29 +09:00
send-pack.c	Merge branch 'jk/send-pack-check-negative-with-quick'	2019-12-06 15:09:22 -08:00
send-pack.h	…
sequencer.c	Revert "Merge branch 'ra/rebase-i-more-options'"	2020-01-12 13:25:18 -08:00
sequencer.h	Revert "Merge branch 'ra/rebase-i-more-options'"	2020-01-12 13:25:18 -08:00
serve.c	…
serve.h	…
server-info.c	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
setup.c	Merge branch 'js/gitdir-at-unc-root'	2019-09-30 13:19:26 +09:00
sh-i18n--envsubst.c	…
sha1-array.c	sha1-array: move doc to sha1-array.h	2019-11-18 15:21:28 +09:00
sha1-array.h	sha1-array: move doc to sha1-array.h	2019-11-18 15:21:28 +09:00
sha1-file.c	Merge branch 'bc/object-id-part17'	2019-10-11 14:24:46 +09:00
sha1-lookup.c	Merge branch 'js/azure-pipelines-msvc'	2019-10-15 13:48:00 +09:00
sha1-lookup.h	…
sha1-name.c	Merge branch 'rs/nth-switch-code-simplification'	2019-10-07 11:33:00 +09:00
sha1dc_git.c	hex: drop sha1_to_hex()	2019-11-13 10:09:10 +09:00
sha1dc_git.h	…
shallow.c	Merge branch 'rs/dedup-includes'	2019-10-11 14:24:48 +09:00
shell.c	shell: use skip_prefix() instead of starts_with()	2019-11-27 11:18:24 +09:00
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	sigchain: move doc to sigchain.h	2019-11-18 15:21:29 +09:00
split-index.c	…
split-index.h	…
stable-qsort.c	Move git_sort(), a stable sort, into into libgit.a	2019-10-02 14:44:51 +09:00
strbuf.c	strbuf: add a helper function to call the editor "on an strbuf"	2019-12-13 12:37:14 -08:00
strbuf.h	strbuf: add a helper function to call the editor "on an strbuf"	2019-12-13 12:37:14 -08:00
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
sub-process.c	hashmap: remove type arg from hashmap_{get,put,remove}_entry	2019-10-07 10:20:12 +09:00
sub-process.h	hashmap_entry: remove first member requirement from docs	2019-10-07 10:20:12 +09:00
submodule-config.c	fix-typo: consecutive-word duplications	2019-12-16 11:53:11 -08:00
submodule-config.h	submodule-config: move doc to submodule-config.h	2019-11-18 15:21:29 +09:00
submodule.c	Sync with 2.22.2	2019-12-06 16:31:30 +01:00
submodule.h	Sync with 2.22.2	2019-12-06 16:31:30 +01:00
symlinks.c	…
tag.c	commit, tag: don't set parsed bit for parse failures	2019-10-28 14:04:49 +09:00
tag.h	tag: factor out get_tagged_oid()	2019-09-05 14:10:18 -07:00
tar.h	kset.h, tar.h: add missing header guard to prevent multiple inclusion	2019-11-07 20:12:04 +09:00
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	…
tmp-objdir.h	…
trace.c	packfile: drop release_pack_memory()	2019-08-13 12:21:33 -07:00
trace.h	trace: move doc to trace.h	2019-11-18 15:21:29 +09:00
trace2.c	…
trace2.h	trace2: move doc to trace2.h	2019-11-18 15:21:29 +09:00
trailer.c	…
trailer.h	…
transport-helper.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
transport-internal.h	transport: teach all vtables to allow fetch first	2019-08-22 14:20:39 -07:00
transport.c	transport: push codepath can take arbitrary repository	2019-10-08 13:20:01 +09:00
transport.h	remote-curl: pass on atomic capability to remote side	2019-10-17 16:08:22 +09:00
tree-diff.c	…
tree-walk.c	Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'	2020-01-06 14:17:50 -08:00
tree-walk.h	tree-walk: move doc to tree-walk.h	2019-11-18 15:21:29 +09:00
tree.c	tree: simplify parse_tree_indirect()	2019-09-03 15:10:53 -07:00
tree.h	…
unicode-width.h	Merge branch 'bb/unicode-12.1-reiwa' into maint	2019-07-25 14:27:11 -07:00
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
unpack-trees.h	sparse-checkout: update working directory in-process	2019-11-22 16:11:44 +09:00
upload-pack.c	Merge branch 'jk/disable-commit-graph-during-upload-pack'	2019-10-07 11:32:55 +09:00
upload-pack.h	…
url.c	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	vreportf(): avoid relying on stdio buffering	2019-11-02 15:20:21 +09:00
userdiff.c	Merge branch 'ln/userdiff-elixir'	2019-12-25 11:21:59 -08:00
userdiff.h	…
utf8.c	utf8: use skip_iprefix() in same_utf_encoding()	2019-11-10 16:04:36 +09:00
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	Merge branch 'nd/corrupt-worktrees' into maint	2019-07-25 14:27:07 -07:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	Merge branch 'ah/cleanups'	2019-10-09 14:01:00 +09:00
write-or-die.c	…
ws.c	…
wt-status.c	Merge branch 'bc/object-id-part17'	2019-10-11 14:24:46 +09:00
wt-status.h	wt-status: convert struct wt_status to object_id	2019-08-19 15:04:59 -07:00
xdiff-interface.c	…
xdiff-interface.h	Fix spelling errors in code comments	2019-11-10 16:00:54 +09:00
zlib.c	…

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). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. 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