Go to file

Ævar Arnfjörð Bjarmason 3494dfd3ee send-email: do defaults -> config -> getopt in that order Change the git-send-email command-line argument parsing and config reading code to parse those two in the right order. I.e. first we set our hardcoded defaults, then we read our config, and finally we read the command-line, with later sets overriding earlier sets. This fixes a bug introduced in `e67a228cd8` ("send-email: automatically determine transfer-encoding", 2018-07-08). That change broke the reading of sendmail.transferencoding because it wasn't careful to update the code to parse them in the previous "defaults -> getopt -> config" order. But as we can see from the history for this file doing it this way was never what we actually wanted, it's just something we grew organically as of `5483c71d7a` ("git-send-email: make options easier to configure.", 2007-06-27) and have been dealing with the fallout since, e.g. in `463b0ea22b` ("send-email: Fix %config_path_settings handling", 2011-10-14). As can be seen in this change the only place where we actually want to do something clever is with the to/cc/bcc variables, where setting them on the command-line (or using --no-{to,cc,bcc}) should clear out values we grab from the config. All the rest are things where the command-line should simply override the config values, and by reading the config first the config code doesn't need all this "let's not set it, if it was on the command-line" special-casing, as [1] shows we'd otherwise need to care about the difference between whether something was a default or present in config to fix the bug in `e67a228cd8`. 1. https://public-inbox.org/git/20190508105607.178244-2-gitster@pobox.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2019-05-13 17:54:07 +09:00
.github	…
Documentation	send-email: automatically determine transfer-encoding	2018-07-09 10:55:12 -07:00
block-sha1	…
builtin	Merge branch 'sb/blame-color'	2018-06-18 10:18:45 -07:00
ci	Merge branch 'nd/travis-gcc-8'	2018-05-30 14:04:08 +09:00
compat	…
contrib	Merge branch 'ab/cred-netrc-no-autodie'	2018-06-18 10:18:42 -07:00
ewah	ewah_read_mmap: bounds-check mmap reads	2018-06-18 09:13:57 -07:00
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
perl	Merge branch 'ab/git-svn-get-record-typofix'	2018-05-08 15:59:28 +09:00
po	l10n: ko.po: Update Korean translation	2018-06-19 02:19:42 +09:00
ppc	…
refs	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
sha1collisiondetection@19d97bf5af	…
sha1dc	…
t	send-email: do defaults -> config -> getopt in that order	2019-05-13 17:54:07 +09:00
templates	Update shell scripts to compute empty tree object ID	2018-05-02 13:59:53 +09:00
vcs-svn	Convert remaining die*(BUG) messages	2018-05-06 19:06:14 +09:00
xdiff	…
.clang-format	…
.gitattributes	.gitattributes: add a diff driver for Python	2018-04-27 09:18:55 +09:00
.gitignore	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
.gitmodules	…
.mailmap	mailmap: update brian m. carlson's email address	2018-05-08 12:21:10 +09:00
.travis.yml	travis-ci: run gcc-8 on linux-gcc jobs	2018-05-21 14:14:09 +09:00
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	Git 2.18	2018-06-21 10:00:06 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'es/make-no-iconv'	2018-06-18 11:23:24 -07:00
README.md	note git-security@googlegroups.com in more places	2018-06-01 09:24:11 +09:00
RelNotes	Git 2.17.1	2018-05-22 14:28:26 +09:00
abspath.c	…
aclocal.m4	…
advice.c	Merge branch 'js/deprecate-grafts'	2018-05-23 14:38:17 +09:00
advice.h	Deprecate support for .git/info/grafts	2018-04-30 11:12:31 +09:00
alias.c	completion: add and use --list-cmds=alias	2018-05-21 13:23:14 +09:00
alias.h	completion: add and use --list-cmds=alias	2018-05-21 13:23:14 +09:00
alloc.c	…
apply.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
apply.h	…
archive-tar.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
archive-zip.c	…
archive.c	Use OPT_SET_INT_F() for cmdline option specification	2018-05-24 16:12:29 +09:00
archive.h	…
argv-array.c	Merge branch 'ma/unpack-trees-free-msgs'	2018-05-30 21:51:29 +09:00
argv-array.h	Merge branch 'ma/unpack-trees-free-msgs'	2018-05-30 21:51:29 +09:00
attr.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
blame.h	…
blob.c	…
blob.h	…
branch.c	refspec: rename struct refspec to struct refspec_item	2018-05-18 06:19:41 +09:00
branch.h	…
builtin.h	Merge branch 'ds/commit-graph'	2018-05-08 15:59:20 +09:00
bulk-checkin.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
bulk-checkin.h	…
bundle.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
bundle.h	…
cache-tree.c	cache-tree: use is_empty_tree_oid	2018-05-02 13:59:52 +09:00
cache-tree.h	…
cache.h	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check-racy.c	…
check_bindir	…
checkout.c	refspec: rename struct refspec to struct refspec_item	2018-05-18 06:19:41 +09:00
checkout.h	…
color.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
color.h	…
column.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
column.h	…
combine-diff.c	…
command-list.txt	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
commit-graph.c	Merge branch 'sb/oid-object-info'	2018-05-23 14:38:16 +09:00
commit-graph.h	…
commit-slab.h	…
commit.c	Merge branch 'jk/index-pack-maint'	2018-06-13 12:50:46 -07:00
commit.h	Merge branch 'nd/pack-struct-commit'	2018-05-30 14:04:08 +09:00
common-main.c	Merge branch 'dj/runtime-prefix'	2018-05-08 15:59:17 +09:00
config.c	Merge branch 'ma/config-store-data-clear'	2018-05-30 21:51:28 +09:00
config.h	Merge branch 'tb/config-default'	2018-05-08 15:59:27 +09:00
config.mak.dev	…
config.mak.in	…
config.mak.uname	Merge branch 'nd/repack-keep-pack'	2018-05-23 14:38:14 +09:00
configure.ac	…
connect.c	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'ls/checkout-encoding'	2018-05-08 15:59:22 +09:00
convert.h	Merge branch 'ls/checkout-encoding'	2018-05-08 15:59:22 +09:00
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
decorate.c	…
decorate.h	…
delta.h	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'bc/object-id'	2018-05-30 14:04:10 +09:00
diff.h	add status config and command line options for rename detection	2018-05-13 10:57:37 +09:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	regex: do not call `regfree()` if compilation fails	2018-05-21 13:58:32 +09:00
diffcore-rename.c	…
diffcore.h	…
dir-iterator.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
dir-iterator.h	…
dir.c	Merge branch 'jk/ewah-bounds-check'	2018-06-18 11:23:22 -07:00
dir.h	Merge branch 'bc/object-id'	2018-05-30 14:04:10 +09:00
editor.c	…
entry.c	…
environment.c	Merge branch 'ls/checkout-encoding'	2018-05-08 15:59:22 +09:00
exec-cmd.c	Merge branch 'js/runtime-prefix'	2018-05-08 15:59:34 +09:00
exec-cmd.h	Merge branch 'dj/runtime-prefix'	2018-05-08 15:59:17 +09:00
fast-import.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
fetch-object.c	…
fetch-object.h	…
fetch-pack.c	Merge branch 'jt/partial-clone-proto-v2'	2018-05-30 14:04:10 +09:00
fetch-pack.h	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
fmt-merge-msg.h	…
fsck.c	Merge branch 'jk/submodule-fsck-loose-fixup'	2018-06-13 12:50:44 -07:00
fsck.h	fsck: detect gitmodules files	2018-05-21 23:55:12 -04:00
fsmonitor.c	Merge branch 'jk/snprintf-truncation'	2018-05-30 21:51:28 +09:00
fsmonitor.h	…
generate-cmdlist.sh	git: support --list-cmds=list-<category>	2018-05-21 13:23:14 +09:00
gettext.c	Merge branch 'js/runtime-prefix'	2018-05-08 15:59:34 +09:00
gettext.h	…
git-add--interactive.perl	add--interactive: compute the empty tree value	2018-05-02 13:59:53 +09:00
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	Update shell scripts to compute empty tree object ID	2018-05-02 13:59:53 +09:00
git-instaweb.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	merge-one-file: compute empty blob object ID	2018-05-02 13:59:53 +09:00
git-merge-resolve.sh	…
git-mergetool--lib.sh	…
git-mergetool.sh	…
git-p4.py	Merge branch 'ld/git-p4-updates'	2018-06-18 10:18:41 -07:00
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	Merge branch 'js/rebase-recreate-merge'	2018-06-01 15:06:40 +09:00
git-rebase--merge.sh	…
git-rebase.sh	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	send-email: do defaults -> config -> getopt in that order	2019-05-13 17:54:07 +09:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	Merge branch 'sb/submodule-update-try-harder'	2018-05-30 14:04:12 +09:00
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	Merge branch 'ma/regex-no-regfree-after-comp-fail'	2018-05-30 21:51:28 +09:00
grep.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
help.h	completion: allow to customize the completable command list	2018-05-21 13:23:14 +09:00
hex.c	…
http-backend.c	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
http-fetch.c	Merge branch 'ma/http-walker-no-partial'	2018-05-08 15:59:35 +09:00
http-push.c	Merge branch 'bw/ref-prefix-for-configured-refspec'	2018-05-30 21:51:26 +09:00
http-walker.c	…
http.c	Merge branch 'bw/remote-curl-compressed-responses'	2018-05-30 21:51:29 +09:00
http.h	Merge branch 'jk/snprintf-truncation'	2018-05-30 21:51:28 +09:00
ident.c	…
imap-send.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
iterator.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
line-log.h	…
line-range.c	…
line-range.h	…
list-objects-filter-options.c	…
list-objects-filter-options.h	…
list-objects-filter.c	Merge branch 'sb/oid-object-info'	2018-05-23 14:38:16 +09:00
list-objects-filter.h	…
list-objects.c	…
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
lockfile.h	…
log-tree.c	Merge branch 'jk/snprintf-truncation'	2018-05-30 21:51:28 +09:00
log-tree.h	format-patch: make cover letters always text/plain	2018-05-02 12:55:00 +09:00
ls-refs.c	…
ls-refs.h	…
mailinfo.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
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/rename-directory-detection'	2018-06-18 10:18:44 -07:00
merge-recursive.h	merge: add merge.renames config setting	2018-05-08 16:19:41 +09:00
merge.c	Merge branch 'ma/unpack-trees-free-msgs'	2018-05-30 21:51:29 +09:00
mergesort.c	…
mergesort.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-store.h	Merge branch 'nd/pack-objects-pack-struct'	2018-05-23 14:38:19 +09:00
object.c	Merge branch 'sb/oid-object-info'	2018-05-23 14:38:16 +09:00
object.h	Merge branch 'nd/pack-objects-pack-struct'	2018-05-23 14:38:19 +09:00
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
pack-bitmap.c	Merge branch 'jk/ewah-bounds-check'	2018-06-18 11:23:22 -07:00
pack-bitmap.h	…
pack-check.c	…
pack-objects.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
pack-objects.h	Merge branch 'nd/pack-objects-pack-struct'	2018-05-23 14:38:19 +09:00
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	Merge branch 'jl/zlib-restore-nul-termination'	2018-06-18 10:18:43 -07:00
packfile.h	Merge branch 'bc/object-id'	2018-05-30 14:04:10 +09:00
pager.c	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
path.h	…
pathspec.c	Convert remaining die*(BUG) messages	2018-05-06 19:06:14 +09:00
pathspec.h	…
pkt-line.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
pretty.h	…
prio-queue.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'bc/object-id'	2018-05-30 14:04:10 +09:00
ref-filter.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
ref-filter.h	Merge branch 'ot/libify-get-ref-atom-value'	2018-05-08 15:59:18 +09:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'jk/snprintf-truncation'	2018-05-30 21:51:28 +09:00
refs.h	Merge branch 'sb/object-store-replace'	2018-05-08 15:59:21 +09:00
refspec.c	Merge branch 'bw/refspec-api'	2018-06-04 21:39:50 +09:00
refspec.h	fetch: do not pass ref-prefixes for fetch by exact SHA1	2018-06-01 15:15:22 +09:00
remote-curl.c	remote-curl: accept compressed responses with protocol v2	2018-05-23 10:24:13 +09:00
remote-testsvn.c	…
remote.c	Merge branch 'bw/ref-prefix-for-configured-refspec'	2018-05-30 21:51:26 +09:00
remote.h	Merge branch 'bw/ref-prefix-for-configured-refspec'	2018-05-30 21:51:26 +09:00
replace-object.c	Merge branch 'sb/object-store-replace'	2018-05-23 14:38:09 +09:00
replace-object.h	…
repository.c	Merge branch 'nd/repo-clear-keep-the-index'	2018-05-30 14:04:05 +09:00
repository.h	Merge branch 'sb/object-store-replace'	2018-05-08 15:59:21 +09:00
rerere.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
rerere.h	…
resolve-undo.c	cache: add a function to read an object ID from a buffer	2018-05-02 13:59:48 +09:00
resolve-undo.h	…
revision.c	Merge branch 'bc/object-id'	2018-05-30 14:04:10 +09:00
revision.h	…
run-command.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'js/rebase-i-root-fix'	2018-06-18 11:23:22 -07:00
sequencer.h	Merge branch 'js/sequencer-and-root-commits'	2018-05-30 14:04:04 +09:00
serve.c	…
serve.h	…
server-info.c	server-info: remove unused members from struct pack_info	2018-05-02 13:59:48 +09:00
setup.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
sh-i18n--envsubst.c	…
sha1-array.c	get_short_oid: sort ambiguous objects by type, then SHA-1	2018-05-11 14:43:23 +09:00
sha1-array.h	get_short_oid: sort ambiguous objects by type, then SHA-1	2018-05-11 14:43:23 +09:00
sha1-file.c	Merge branch 'rd/comment-typofix-in-sha1-file'	2018-06-18 10:18:40 -07:00
sha1-lookup.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
sha1-lookup.h	…
sha1-name.c	Merge branch 'ab/get-short-oid'	2018-05-30 14:04:11 +09:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
shell.c	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
sigchain.h	…
split-index.c	split-index: convert struct split_index to object_id	2018-05-02 13:59:50 +09:00
split-index.h	split-index: convert struct split_index to object_id	2018-05-02 13:59:50 +09:00
strbuf.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
strbuf.h	Merge branch 'en/rename-directory-detection-reboot'	2018-05-23 14:38:19 +09:00
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	Merge branch 'bc/object-id'	2018-05-30 14:04:10 +09:00
submodule-config.h	Merge branch 'bc/object-id'	2018-05-30 14:04:10 +09:00
submodule.c	Merge branch 'jt/submodule-pull-recurse-rebase'	2018-06-04 21:39:48 +09:00
submodule.h	Merge branch 'jt/submodule-pull-recurse-rebase'	2018-06-04 21:39:48 +09:00
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
tmp-objdir.h	…
trace.c	…
trace.h	…
trailer.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
trailer.h	…
transport-helper.c	remote: convert apply_refspecs to take a struct refspec	2018-05-18 06:19:43 +09:00
transport-internal.h	…
transport.c	Merge branch 'bw/ref-prefix-for-configured-refspec'	2018-05-30 21:51:26 +09:00
transport.h	Merge branch 'bw/ref-prefix-for-configured-refspec'	2018-05-30 21:51:26 +09:00
tree-diff.c	…
tree-walk.c	tree-walk: convert get_tree_entry_follow_symlinks to object_id	2018-05-02 13:59:50 +09:00
tree-walk.h	tree-walk: convert get_tree_entry_follow_symlinks to object_id	2018-05-02 13:59:50 +09:00
tree.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'ma/unpack-trees-free-msgs'	2018-05-30 21:51:29 +09:00
unpack-trees.h	unpack_trees_options: free messages when done	2018-05-22 11:59:31 +09:00
upload-pack.c	Merge branch 'jt/partial-clone-proto-v2'	2018-05-30 14:04:10 +09:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	Merge branch 'jk/snprintf-truncation'	2018-05-30 21:51:28 +09:00
userdiff.c	…
userdiff.h	…
utf8.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
utf8.h	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00
write-or-die.c	…
ws.c	…
wt-status.c	Merge branch 'bc/object-id'	2018-05-30 14:04:10 +09:00
wt-status.h	add status config and command line options for rename detection	2018-05-13 10:57:37 +09:00
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00

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-.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://public-inbox.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