Go to file
Brandon Williams 60a12722ac attr: remove maybe-real, maybe-macro from git_attr
Whether or not a git attribute is real or a macro isn't a property of
the attribute but rather it depends on the attribute stack (which
.gitattribute files were read).

This patch removes the 'maybe_real' and 'maybe_macro' fields in a
git_attr and instead adds the 'macro' field to a attr_check_item.  The
'macro' indicates (if non-NULL) that a particular attribute is a macro
for the given attribute stack.  It's populated, through a quick scan of
the attribute stack, with the match_attr that corresponds to the macro's
definition.  This way the attribute stack only needs to be scanned a
single time prior to attribute collection instead of each time a macro
needs to be expanded.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-01 13:46:53 -08:00
Documentation attr: retire git_check_attrs() API 2017-02-01 13:46:52 -08:00
block-sha1
builtin attr: convert git_check_attrs() callers to use the new API 2017-02-01 13:46:52 -08:00
ci
compat Merge branch 'js/mingw-isatty' 2016-12-27 00:11:46 -08:00
contrib Merge branch 'ls/filter-process' 2016-12-27 00:11:42 -08:00
ewah
git-gui
gitk-git
gitweb
mergetools Merge branch 'da/mergetool-xxdiff-hotkey' 2016-12-19 14:45:41 -08:00
perl Merge branch 'va/i18n-perl-scripts' 2016-12-27 00:11:40 -08:00
po
ppc
refs
t attr: support quoting pathname patterns in C style 2017-02-01 13:46:52 -08:00
templates
vcs-svn
xdiff Merge branch 'jc/retire-compaction-heuristics' 2017-01-10 15:24:27 -08:00
.gitattributes
.gitignore Merge branch 'bb/unicode-9.0' 2016-12-19 14:45:36 -08:00
.mailmap
.travis.yml travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux build 2016-12-05 14:55:52 -08:00
COPYING
GIT-VERSION-GEN GIT-VERSION-GEN: do not force abbreviation length used by 'describe' 2016-12-06 10:08:31 -08:00
INSTALL
LGPL-2.1
Makefile Merge branch 'va/i18n-perl-scripts' 2016-12-27 00:11:40 -08:00
README.md README: replace gmane link with public-inbox 2016-12-15 09:30:09 -08:00
RelNotes Start post 2.11 cycle 2016-12-05 11:31:47 -08:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c hold_locked_index(): align error handling with hold_lockfile_for_update() 2016-12-07 11:31:59 -08:00
apply.h
archive-tar.c
archive-zip.c
archive.c attr: convert git_check_attrs() callers to use the new API 2017-02-01 13:46:52 -08:00
archive.h
argv-array.c
argv-array.h
attr.c attr: remove maybe-real, maybe-macro from git_attr 2017-02-01 13:46:53 -08:00
attr.h attr: eliminate global check_all_attr array 2017-02-01 13:46:53 -08:00
base85.c
bisect.c bisect: improve English grammar of not-ancestors message 2016-12-05 14:50:38 -08:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jc/git-open-cloexec' 2017-01-10 15:24:26 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c commit.c: use strchrnul() to scan for one line 2017-02-01 13:46:51 -08:00
commit.h commit: make ignore_non_trailer take buf/len 2016-11-29 14:22:18 -08:00
common-main.c attr: use hashmap for attribute dictionary 2017-02-01 13:46:53 -08:00
config.c Merge branch 'nd/config-misc-fixes' 2017-01-10 15:24:27 -08:00
config.mak.in
config.mak.uname xdiff: drop XDL_FAST_HASH 2016-12-06 13:27:11 -08:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c attr: convert git_check_attrs() callers to use the new API 2017-02-01 13:46:52 -08: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 Merge branch 'jk/daemon-path-ok-check-truncation' into maint 2016-11-29 13:27:56 -08:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jc/retire-compaction-heuristics' 2017-01-10 15:24:27 -08:00
diff.h
diffcore-break.c Merge branch 'tk/diffcore-delta-remove-unused' into maint 2016-11-29 13:28:03 -08:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'tk/diffcore-delta-remove-unused' into maint 2016-11-29 13:28:03 -08:00
diffcore.h Merge branch 'tk/diffcore-delta-remove-unused' into maint 2016-11-29 13:28:03 -08:00
dir-iterator.c
dir-iterator.h
dir.c submodule: add absorb-git-dir function 2016-12-12 15:15:07 -08:00
dir.h submodule: add absorb-git-dir function 2016-12-12 15:15:07 -08:00
editor.c
entry.c
environment.c
exec_cmd.c common-main: stop munging argv[0] path 2016-11-29 11:01:48 -08:00
exec_cmd.h common-main: stop munging argv[0] path 2016-11-29 11:01:48 -08:00
fast-import.c Merge branch 'mh/fast-import-notes-fix-new' 2017-01-10 15:24:26 -08:00
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'jc/retire-compaction-heuristics' 2017-01-10 15:24:27 -08:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'jk/common-main' into maint-2.10 2016-12-05 11:24:28 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl Merge branch 'jk/difftool-in-subdir' 2016-12-27 00:11:43 -08:00
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 Merge branch 'ls/p4-lfs' 2016-12-27 00:11:46 -08:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'va/i18n-even-more' 2016-12-27 00:11:45 -08:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'nd/rebase-forget' 2016-12-19 14:45:35 -08:00
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl i18n: send-email: mark composing message for translation 2016-12-14 11:00:06 -08:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'va/i18n-even-more' 2016-12-27 00:11:45 -08:00
git-stash.sh Merge branch 'jk/stash-disable-renames-internally' 2016-12-19 14:45:33 -08:00
git-submodule.sh Merge branch 'sb/submodule-embed-gitdir' 2017-01-10 15:24:28 -08:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'sb/submodule-embed-gitdir' 2017-01-10 15:24:28 -08:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c Merge branch 'jk/http-walker-limit-redirect-2.9' 2016-12-19 14:45:32 -08:00
http.c Merge branch 'bw/transport-protocol-policy' 2016-12-27 00:11:41 -08:00
http.h Merge branch 'jk/http-walker-limit-redirect-2.9' 2016-12-19 14:45:32 -08:00
ident.c
imap-send.c
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
list.h
ll-merge.c attr: convert git_check_attrs() callers to use the new API 2017-02-01 13:46:52 -08:00
ll-merge.h
lockfile.c lockfile: LOCK_REPORT_ON_ERROR 2016-12-07 11:31:59 -08:00
lockfile.h lockfile: move REPORT_ON_ERROR bit elsewhere 2016-12-27 09:12:09 -08:00
log-tree.c
log-tree.h
mailinfo.c Merge branch 'jt/mailinfo-fold-in-body-headers' 2016-12-21 14:55:03 -08:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'jc/lock-report-on-error' 2016-12-19 14:45:35 -08:00
merge-recursive.h
merge.c lockfile: LOCK_REPORT_ON_ERROR 2016-12-07 11:31:59 -08:00
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object.c
object.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c parse-options: print "fatal:" before usage_msg_opt() 2016-12-14 09:58:09 -08:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'js/normalize-path-copy-ceil' 2016-12-19 14:45:37 -08:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c pretty: add %(trailers) format for displaying trailers of a commit message 2016-12-11 13:58:41 -08:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'jc/git-open-cloexec' 2017-01-10 15:24:26 -08:00
ref-filter.c Merge branch 'jk/trailers-placeholder-in-pretty' 2016-12-19 14:45:34 -08:00
ref-filter.h tag, branch, for-each-ref: add --ignore-case for sorting and filtering 2016-12-05 14:59:29 -08:00
reflog-walk.c
reflog-walk.h
refs.c
refs.h
remote-curl.c Merge branch 'dt/smart-http-detect-server-going-away' 2017-01-10 15:24:25 -08:00
remote-testsvn.c
remote.c
remote.h
replace_object.c
rerere.c hold_locked_index(): align error handling with hold_lockfile_for_update() 2016-12-07 11:31:59 -08:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'sb/sequencer-abort-safety' 2016-12-21 14:55:01 -08:00
sequencer.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jc/git-open-cloexec' 2017-01-10 15:24:26 -08:00
sha1_name.c
shallow.c Merge branch 'nd/shallow-fixup' 2016-12-21 14:55:02 -08:00
shell.c
shortlog.h shortlog: group by committer information 2016-12-15 16:19:13 -08:00
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule-config.c
submodule-config.h
submodule.c Merge branch 'sb/submodule-embed-gitdir' 2017-01-10 15:24:28 -08:00
submodule.h Merge branch 'sb/submodule-embed-gitdir' 2017-01-10 15:24:28 -08:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c tmp-objdir: quote paths we add to alternates 2016-12-12 15:10:46 -08:00
tmp-objdir.h
trace.c
trace.h
trailer.c trailer: have function to describe trailer layout 2016-11-29 14:22:18 -08:00
trailer.h trailer: have function to describe trailer layout 2016-11-29 14:22:18 -08:00
transport-helper.c
transport.c Merge branch 'bw/transport-protocol-policy' 2016-12-27 00:11:41 -08:00
transport.h Merge branch 'bw/transport-protocol-policy' 2016-12-27 00:11:41 -08:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode_width.h unicode_width.h: update the width tables to Unicode 9.0 2016-12-14 09:48:07 -08:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'sb/unpack-trees-grammofix' 2016-12-19 14:45:31 -08:00
unpack-trees.h
upload-pack.c
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c attr: convert git_check_attrs() callers to use the new API 2017-02-01 13:46:52 -08:00
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 worktree: initialize return value for submodule_uses_worktrees 2016-12-27 13:59:49 -08:00
worktree.h worktree: check if a submodule uses worktrees 2016-12-12 15:15:07 -08:00
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c attr: convert git_check_attrs() callers to use the new API 2017-02-01 13:46:52 -08:00
wt-status.c wt-status: implement opportunisitc index update correctly 2016-12-07 11:31:58 -08:00
wt-status.h
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 http://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.

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