Go to file

Denton Liu 8164c961e1 format-patch: use --notes behavior for format.notes When we had multiple `format.notes` config values where we had `<ref1>`, `false`, `<ref2>` (in that order), then we would print out the notes for both `<ref1>` and `<ref2>`. This doesn't make sense, however, since we parse the config in a top-down manner and a `false` should be able to override previous configurations, just like how `--no-notes` will override previous `--notes`. Duplicate the logic that handles the `--[no-]notes[=]` option to `format.notes` for consistency. As a result, when parsing the config from top to bottom, `format.notes = true` will behave like `--notes`, `format.notes = <ref>` will behave like `--notes=<ref>` and `format.notes = false` will behave like `--no-notes`. This change isn't strictly backwards compatible but since it is an edge case where a sane user would not mix notes refs with `false` and this feature is relatively new (released only in v2.23.0), this change should be harmless. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2019-12-09 13:37:20 -08:00
.github	…
Documentation	format-patch: teach format.notes config option	2019-05-17 12:51:53 +09:00
block-sha1	…
builtin	format-patch: use --notes behavior for format.notes	2019-12-09 13:37:20 -08:00
ci	ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build job	2019-04-05 14:41:16 +09:00
compat	…
contrib	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
ewah	…
git-gui	…
gitk-git	…
gitweb	gitweb: make hash size independent	2019-04-01 11:57:39 +09:00
mergetools	mergetools: add support for smerge (Sublime Merge)	2019-04-04 18:21:25 +09:00
negotiator	…
perl	Git.pm: make hash size independent	2019-04-01 11:57:39 +09:00
po	…
ppc	…
refs	Merge branch 'jk/refs-double-abort'	2019-04-16 19:28:11 +09:00
sha1collisiondetection@16033998da	…
sha1dc	…
sha256	…
t	format-patch: use --notes behavior for format.notes	2019-12-09 13:37:20 -08:00
templates	…
trace2	Merge branch 'js/trace2-to-directory'	2019-05-09 00:37:24 +09:00
vcs-svn	…
xdiff	xdiff: use xmalloc/xrealloc	2019-04-12 13:34:17 +09:00
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	Merge branch 'js/misc-doc-fixes'	2019-05-09 00:37:27 +09:00
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	…
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'js/misc-doc-fixes'	2019-05-09 00:37:27 +09:00
README.md	…
RelNotes	…
abspath.c	…
aclocal.m4	…
advice.c	tag: advise on nested tags	2019-04-12 10:52:35 +09:00
advice.h	tag: advise on nested tags	2019-04-12 10:52:35 +09:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	…
apply.h	…
archive-tar.c	archive: convert struct archiver_args to object_id	2019-04-01 11:57:39 +09:00
archive-zip.c	archive: convert struct archiver_args to object_id	2019-04-01 11:57:39 +09:00
archive.c	Merge branch 'en/merge-directory-renames'	2019-05-09 00:37:22 +09:00
archive.h	archive: convert struct archiver_args to object_id	2019-04-01 11:57:39 +09:00
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
azure-pipelines.yml	…
banned.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	Merge branch 'en/merge-directory-renames'	2019-05-09 00:37:22 +09:00
blame.h	Use 'unsigned short' for mode, like diff_filespec does	2019-04-08 16:02:07 +09:00
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	Merge branch 'js/misc-doc-fixes'	2019-05-09 00:37:27 +09:00
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit-graph.c	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
commit-graph.h	commit-graph write: don't die if the existing graph is corrupt	2019-04-01 12:14:50 +09:00
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'tb/unexpected'	2019-05-09 00:37:25 +09:00
commit.h	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
common-main.c	…
config.c	Merge branch 'nd/include-if-wildmatch'	2019-04-22 11:14:46 +09:00
config.h	…
config.mak.dev	…
config.mak.in	…
config.mak.uname	Merge branch 'cc/aix-has-fileno-as-a-macro'	2019-05-09 00:37:28 +09:00
configure.ac	autoconf: #include <libintl.h> when checking for gettext()	2019-04-19 13:57:23 +09:00
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'jh/resize-convert-scratch-buffer'	2019-04-10 02:14:22 +09:00
convert.h	…
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	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	Merge branch 'nd/diff-parseopt-4'	2019-04-25 16:41:12 +09:00
diff.c	Merge branch 'jt/batch-fetch-blobs-in-diff'	2019-04-25 16:41:19 +09:00
diff.h	Merge branch 'nd/diff-parseopt-4'	2019-04-25 16:41:12 +09:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'jk/untracked-cache-more-fixes'	2019-05-09 00:37:28 +09:00
dir.h	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
editor.c	…
entry.c	…
environment.c	…
exec-cmd.c	…
exec-cmd.h	…
fast-import.c	Merge branch 'bc/hash-transition-16'	2019-04-25 16:41:17 +09:00
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-object.c	…
fetch-object.h	…
fetch-pack.c	Merge branch 'jk/fetch-reachability-error-fix'	2019-04-25 16:41:23 +09:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	Use 'unsigned short' for mode, like diff_filespec does	2019-04-08 16:02:07 +09:00
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	help -a: do not list commands that are excluded from the build	2019-04-19 14:03:24 +09:00
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'ss/msvc-path-utils-fix'	2019-05-09 00:37:26 +09:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-legacy-stash.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	mergetools: add support for smerge (Sublime Merge)	2019-04-04 18:21:25 +09:00
git-mergetool.sh	…
git-p4.py	…
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--common.sh	…
git-rebase--preserve-merges.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'bs/sendemail-tighten-anything-by'	2019-04-25 16:41:25 +09:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	Merge branch 'km/empty-repo-is-still-a-repo'	2019-05-09 00:37:23 +09:00
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'js/misc-doc-fixes'	2019-05-09 00:37:27 +09:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash.h	hash: add a function to lookup hash algorithm by length	2019-04-01 11:57:39 +09:00
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	http-backend: allow 64-character hex names	2019-04-01 11:57:38 +09:00
http-fetch.c	…
http-push.c	http-push: remove remaining uses of sha1_to_hex	2019-04-01 11:57:38 +09:00
http-walker.c	Merge branch 'bc/hash-transition-16'	2019-04-25 16:41:17 +09:00
http.c	Merge branch 'bc/hash-transition-16'	2019-04-25 16:41:17 +09:00
http.h	Merge branch 'bc/hash-transition-16'	2019-04-25 16:41:17 +09:00
ident.c	Merge branch 'ps/stash-in-c'	2019-04-22 11:14:43 +09:00
imap-send.c	…
interdiff.c	…
interdiff.h	…
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	khash: move oid hash table definition	2019-04-01 11:57:37 +09:00
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	Merge branch 'en/merge-directory-renames'	2019-05-09 00:37:22 +09:00
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	rev-list: detect broken root trees	2019-04-10 12:59:39 +09:00
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	…
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	Use 'unsigned short' for mode, like diff_filespec does	2019-04-08 16:02:07 +09:00
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	Merge branch 'jk/server-info-rabbit-hole'	2019-04-25 16:41:13 +09:00
midx.h	midx: check both pack and index names for containment	2019-04-16 16:58:21 +09:00
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	notes-merge: switch to use the_hash_algo	2019-04-01 11:57:37 +09:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	notes: extract logic into set_display_notes()	2019-12-09 13:36:45 -08:00
notes.h	notes: extract logic into set_display_notes()	2019-12-09 13:36:45 -08:00
object-store.h	Merge branch 'jt/batch-fetch-blobs-in-diff'	2019-04-25 16:41:19 +09:00
object.c	…
object.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	khash: move oid hash table definition	2019-04-01 11:57:37 +09:00
pack-bitmap-write.c	pack-bitmap: replace sha1_to_hex	2019-04-01 11:57:37 +09:00
pack-bitmap.c	Merge branch 'bc/hash-transition-16'	2019-04-25 16:41:17 +09:00
pack-bitmap.h	pack-bitmap: switch hash tables to use struct object_id	2019-04-01 11:57:37 +09:00
pack-check.c	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	pack-revindex: open index if necessary	2019-04-16 16:58:21 +09:00
pack-revindex.h	pack-revindex: open index if necessary	2019-04-16 16:58:21 +09:00
pack-write.c	…
pack.h	…
packfile.c	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
packfile.h	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
pager.c	…
parse-options-cb.c	…
parse-options.c	Merge branch 'js/difftool-no-index'	2019-04-25 16:41:14 +09:00
parse-options.h	Merge branch 'dl/merge-cleanup-scissors-fix'	2019-05-09 00:37:24 +09:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'nd/rewritten-ref-is-per-worktree'	2019-04-10 02:14:23 +09:00
path.h	…
pathspec.c	…
pathspec.h	…
pkt-line.c	pkt-line: prepare buffer before handling ERR packets	2019-04-15 14:00:51 +09:00
pkt-line.h	…
preload-index.c	…
pretty.c	…
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	Merge branch 'jk/xmalloc'	2019-04-25 16:41:23 +09:00
progress.h	Merge branch 'sg/overlong-progress-fix'	2019-04-25 16:41:19 +09:00
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
quote.c	…
quote.h	…
range-diff.c	…
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'km/empty-repo-is-still-a-repo'	2019-05-09 00:37:23 +09:00
rebase-interactive.c	…
rebase-interactive.h	…
ref-filter.c	Merge branch 'dr/ref-filter-push-track-fix'	2019-05-09 00:37:26 +09:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	refs.c: remove the_repo from read_ref_at()	2019-04-08 17:26:33 +09:00
refs.h	refs.c: remove the_repo from read_ref_at()	2019-04-08 17:26:33 +09:00
refspec.c	refspec: make hash size independent	2019-04-01 11:57:39 +09:00
refspec.h	…
remote-curl.c	Merge branch 'bc/hash-transition-16'	2019-04-25 16:41:17 +09:00
remote-testsvn.c	…
remote.c	Merge branch 'dr/ref-filter-push-track-fix'	2019-05-09 00:37:26 +09:00
remote.h	Merge branch 'dr/ref-filter-push-track-fix'	2019-05-09 00:37:26 +09:00
replace-object.c	…
replace-object.h	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	notes: extract logic into set_display_notes()	2019-12-09 13:36:45 -08:00
revision.h	…
run-command.c	…
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'dl/merge-cleanup-scissors-fix'	2019-05-09 00:37:24 +09:00
sequencer.h	Merge branch 'dl/merge-cleanup-scissors-fix'	2019-05-09 00:37:24 +09:00
serve.c	…
serve.h	…
server-info.c	update_info_refs(): drop unused force parameter	2019-04-16 16:58:21 +09:00
setup.c	sha1-name.c: remove the_repo from maybe_die_on_misspelt_object_name	2019-04-16 18:56:53 +09:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-file.c	Merge branch 'jt/batch-fetch-blobs-in-diff'	2019-04-25 16:41:19 +09:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	…
split-index.h	…
strbuf.c	Merge branch 'ps/stash-in-c'	2019-04-22 11:14:43 +09:00
strbuf.h	Merge branch 'ps/stash-in-c'	2019-04-22 11:14:43 +09:00
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	submodule-config.c: use repo_get_oid for reading .gitmodules	2019-04-16 18:56:53 +09:00
submodule-config.h	…
submodule.c	Merge branch 'bc/hash-transition-16'	2019-04-25 16:41:17 +09:00
submodule.h	…
symlinks.c	…
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	Merge branch 'jt/clone-server-option'	2019-05-09 00:37:25 +09:00
transport.h	…
tree-diff.c	Use 'unsigned short' for mode, like diff_filespec does	2019-04-08 16:02:07 +09:00
tree-walk.c	Use 'unsigned short' for mode, like diff_filespec does	2019-04-08 16:02:07 +09:00
tree-walk.h	Use 'unsigned short' for mode, like diff_filespec does	2019-04-08 16:02:07 +09:00
tree.c	…
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'jt/batch-fetch-blobs-in-diff'	2019-04-25 16:41:19 +09:00
unpack-trees.h	…
upload-pack.c	Merge branch 'nd/sha1-name-c-wo-the-repository'	2019-05-09 00:37:25 +09:00
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	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	Merge branch 'jt/submodule-repo-is-with-worktree'	2019-05-09 00:37:28 +09:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	…
ws.c	…
wt-status.c	Merge branch 'dr/ref-filter-push-track-fix'	2019-05-09 00:37:26 +09:00
wt-status.h	merge: cleanup messages like commit	2019-04-18 13:49:29 +09:00
xdiff-interface.c	…
xdiff-interface.h	…
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-.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