1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 18:23:01 +01:00
Find a file
Junio C Hamano 099d2d86a8 ignore: info/exclude should trump core.excludesfile
$GIT_DIR/info/exclude and core.excludesfile (which falls back to
$XDG_HOME/git/ignore) are both ways to override the ignore pattern
lists given by the project in .gitignore files.  The former, which
is per-repository personal preference, should take precedence over
the latter, which is a personal preference default across different
repositories that are accessed from that machine.  The existing
documentation also agrees.

However, the precedence order was screwed up between these two from
the very beginning when 896bdfa2 (add: Support specifying an
excludes file with a configuration variable, 2007-02-27) introduced
core.excludesfile variable.

Noticed-by: Yohei Endo <yoheie@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-04-22 14:31:49 -07:00
block-sha1 block-sha1/sha1.c: have SP around arithmetic operators 2013-10-16 10:27:27 -07:00
builtin annotate: use argv_array 2014-07-16 11:10:11 -07:00
compat C: have space around && and || operators 2013-10-16 10:26:39 -07:00
contrib Merge branch 'mi/typofixes' into maint 2013-12-17 11:34:01 -08:00
Documentation Git 1.8.5.6 2014-12-17 11:18:45 -08:00
git-gui
gitk-git
gitweb Merge branch 'ab/gitweb-author-initials' 2013-09-17 11:42:27 -07:00
mergetools mergetools/diffmerge: support DiffMerge as a git mergetool 2013-10-13 16:00:57 -07:00
perl git-svn: workaround for a bug in svn serf backend 2014-01-17 11:24:30 -08:00
po l10n: de.po: fix translation of 'prefix' 2014-01-03 18:21:38 +01:00
ppc
t ignore: info/exclude should trump core.excludesfile 2015-04-22 14:31:49 -07:00
templates sample pre-commit hook: use --bool when retrieving config var 2013-09-24 12:26:49 -07:00
vcs-svn
xdiff C: have space around && and || operators 2013-10-16 10:26:39 -07:00
.gitattributes
.gitignore Merge branch 'jc/url-match' 2013-09-09 14:50:36 -07:00
.mailmap .mailmap: switch to Thomas Rast's personal address 2013-10-13 14:28:27 -07:00
abspath.c abspath.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
aclocal.m4
advice.c
advice.h
alias.c alias: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
alloc.c alloc.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive-tar.c
archive-zip.c
archive.c archive.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c base85.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
bisect.c
bisect.h
blob.c
blob.h
branch.c Merge branch 'jh/checkout-auto-tracking' into maint 2013-10-23 13:32:50 -07:00
branch.h
builtin.h repack: rewrite the shell script in C 2013-09-17 13:34:50 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h read-cache: optionally disallow NTFS .git variants 2014-12-17 11:04:45 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'tr/log-full-diff-keep-true-parents' into maint 2013-09-18 11:59:05 -07:00
command-list.txt
commit-slab.h
commit.c Remove the line length limit for graft files 2013-12-27 16:46:25 -08:00
commit.h Merge branch 'nd/fetch-into-shallow' into maint 2013-10-23 13:32:17 -07:00
config.c read-cache: optionally disallow NTFS .git variants 2014-12-17 11:04:45 -08:00
config.mak.in
config.mak.uname read-cache: optionally disallow NTFS .git variants 2014-12-17 11:04:45 -08:00
configure.ac
connect.c git_connect(): use common return point 2013-12-09 14:54:48 -08:00
connect.h connect.c: refactor url parsing 2013-12-09 14:54:48 -08:00
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c daemon: be strict at parsing parameters --[no-]informative-errors 2013-12-20 14:05:07 -08:00
date.c Merge branch 'jk/date-c-double-semicolon' 2013-10-30 12:11:01 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
diff-no-index.c Merge branch 'dw/diff-no-index-doc' 2013-09-17 11:42:44 -07:00
diff.c Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
diff.h Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c ignore: info/exclude should trump core.excludesfile 2015-04-22 14:31:49 -07:00
dir.h Merge branch 'jc/ls-files-killed-optim' 2013-09-11 15:03:28 -07:00
editor.c
entry.c checkout_entry(): clarify the use of topath[] parameter 2013-10-24 14:59:39 -07:00
environment.c read-cache: optionally disallow NTFS .git variants 2014-12-17 11:04:45 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'bk/refs-multi-update' 2013-09-20 12:36:12 -07:00
fetch-pack.c Merge branch 'jk/allow-fetch-onelevel-refname' into maint 2014-02-13 13:38:34 -08:00
fetch-pack.h git fetch-pack: add --diag-url 2013-12-09 14:54:47 -08:00
fmt-merge-msg.h
fsck.c fsck: complain about NTFS ".git" aliases in trees 2014-12-17 11:04:45 -08:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl add-interactive: handle unborn branch in patch mode 2013-10-25 14:54:17 -07:00
git-am.sh
git-archimport.perl
git-bisect.sh typofixes: fix misspelt comments 2013-11-12 09:24:27 -08:00
git-compat-util.h Windows: do not redefine _WIN32_WINNT 2013-09-11 14:50:19 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys' 2013-11-04 14:58:05 -08:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh Merge branch 'lc/filter-branch-too-many-refs' 2013-10-17 15:55:12 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool--lib: Fix typo in the merge/difftool help 2013-10-14 16:28:38 -07:00
git-mergetool.sh
git-p4.py Merge branch 'ks/p4-view-spec' 2013-09-18 11:44:50 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'fc/trivial' 2013-09-17 11:42:34 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'es/rebase-i-no-abbrev' into maint 2013-10-17 15:45:50 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'mm/rebase-continue-freebsd-WB' into maint 2013-09-26 12:41:14 -07:00
git-relink.perl
git-remote-testgit.sh transport-helper: add no-private-update capability 2013-09-03 11:57:53 -07:00
git-request-pull.sh
git-send-email.perl Merge branch 'rk/send-email-ssl-cert' into maint 2014-02-13 13:38:19 -08:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'jc/reflog-doc' 2013-10-18 13:50:12 -07:00
git-stash.sh stash: handle specifying stashes with $IFS 2014-01-07 10:51:04 -08:00
git-submodule.sh Sync with 1.8.4.5 2013-12-02 15:34:44 -08:00
git-svn.perl git-svn: Warn about changing default for --prefix in Git v2.0 2013-10-12 22:30:53 +00:00
GIT-VERSION-GEN Git 1.8.5.6 2014-12-17 11:18:45 -08:00
git-web--browse.sh web--browse: Add support for xdg-open 2013-10-30 13:54:15 -07:00
git.c Merge branch 'sb/repack-in-c' 2013-10-18 13:49:57 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c graph: fix coloring around octopus merges 2013-10-18 12:48:48 -07:00
graph.h
grep.c
grep.h
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c Merge branch 'bc/http-backend-allow-405' into maint 2013-10-17 15:46:00 -07:00
http-fetch.c
http-push.c Merge branch 'jk/http-auth-redirects' into maint 2013-11-08 11:37:26 -08:00
http-walker.c
http.c Merge branch 'jk/http-auth-redirects' 2013-10-30 12:09:53 -07:00
http.h http: update base URLs when we see redirects 2013-10-14 16:56:47 -07:00
ident.c Merge branch 'jk/split-broken-ident' into maint 2013-11-07 14:34:51 -08:00
imap-send.c
INSTALL
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c Merge branch 'nd/magic-pathspec' 2013-10-30 12:10:33 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c Merge branch 'nd/fetch-into-shallow' 2013-09-20 12:25:32 -07:00
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c log: properly handle decorations with chained tags 2013-12-20 14:37:03 -08:00
log-tree.h
mailmap.c Merge branch 'jc/strcasecmp-pure-inline' 2013-09-24 23:28:13 -07:00
mailmap.h
Makefile Merge branch 'sb/repack-in-c' 2013-10-18 13:49:57 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'jk/diff-algo' into maint 2013-10-28 10:16:11 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c name-hash: stop storing trailing '/' on paths in index_state.dir_hash 2013-09-17 10:08:07 -07:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h typofix: commit is spelled with two ems 2013-09-04 15:30:03 -07:00
notes.c
notes.h
object.c Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
object.h Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
pack-check.c
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c pager: turn on "cat" optimization for DEFAULT_PAGER 2013-09-03 10:36:12 -07:00
parse-options-cb.c
parse-options.c
parse-options.h Merge branch 'sb/parseopt-boolean-removal' 2013-09-04 12:39:03 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c path: add is_ntfs_dotgit() helper 2014-12-17 11:04:45 -08:00
pathspec.c Merge branch 'mi/typofixes' into maint 2013-12-17 11:34:01 -08:00
pathspec.h pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c enums: remove trailing ',' after last item in enum 2014-07-02 12:37:05 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c Revert "prompt: clean up strbuf usage" 2014-01-02 10:21:40 -08:00
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c read-cache: optionally disallow NTFS .git variants 2014-12-17 11:04:45 -08:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'sb/refs-code-cleanup' 2013-11-01 07:38:58 -07:00
refs.h Merge branch 'sb/refs-code-cleanup' 2013-11-01 07:38:58 -07:00
RelNotes Git 1.8.5.6 2014-12-17 11:18:45 -08:00
remote-curl.c Merge branch 'jk/http-auth-redirects' 2013-10-30 12:09:53 -07:00
remote-testsvn.c
remote.c Merge branch 'jk/remote-literal-string-leakfix' 2013-10-28 10:43:28 -07:00
remote.h Merge branch 'jc/push-cas' 2013-09-09 14:30:29 -07:00
replace_object.c
rerere.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
rerere.h
resolve-undo.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
resolve-undo.h
revision.c Merge branch 'jc/revision-range-unpeel' into maint 2014-02-13 13:38:47 -08:00
revision.h revision: add missing include 2013-10-31 13:46:03 -07:00
run-command.c run-command: trivial style fixes 2013-10-31 13:48:26 -07:00
run-command.h
send-pack.c Merge branch 'jl/pack-transfer-avoid-double-close' 2013-10-30 12:10:45 -07:00
send-pack.h
sequencer.c refs: report ref type from lock_any_ref_for_update 2013-08-30 14:57:28 -07:00
sequencer.h
server-info.c
setup.c setup: trivial style fixes 2013-10-31 13:48:32 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure 2013-12-18 14:59:43 -08:00
sha1_name.c interpret_branch_name: find all possible @-marks 2014-01-15 12:51:14 -08:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'jl/some-submodule-config-are-not-boolean' into maint 2013-09-18 11:59:35 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c
test-match-trees.c use 'tree-ish' instead of 'treeish' 2013-09-04 15:02:56 -07:00
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c path-utils test: rename mingw_path function to print_path 2013-10-14 07:32:53 -07:00
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c transport-helper: trivial style fix 2013-10-31 13:47:22 -07:00
transport.c connect.c: refactor url parsing 2013-12-09 14:54:48 -08:00
transport.h Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' 2013-09-09 14:50:37 -07:00
tree-diff.c pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
tree-walk.c Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint 2014-02-13 13:37:53 -08:00
tree-walk.h
tree.c Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
tree.h Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 2014-12-17 11:11:15 -08:00
unpack-trees.h
upload-pack.c Merge branch 'maint' 2013-11-18 12:25:28 -08:00
url.c
url.h
urlmatch.c urlmatch.c: recompute pointer after append_normalized_escapes 2013-09-12 15:27:01 -07:00
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c is_hfs_dotgit: loosen over-eager match of \u{..47} 2014-12-29 12:06:27 -08:00
utf8.h utf8: add is_hfs_dotgit() helper 2014-12-17 11:04:39 -08:00
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c typofixes: fix misspelt comments 2013-11-12 09:24:27 -08:00
write_or_die.c
ws.c
wt-status.c commit -v: strip diffs and submodule shortlogs from the commit message 2013-12-05 14:39:11 -08:00
wt-status.h commit -v: strip diffs and submodule shortlogs from the commit message 2013-12-05 14:39:11 -08:00
xdiff-interface.c
xdiff-interface.h
zlib.c

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, 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

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.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.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).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

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 http://news.gmane.org/gmane.comp.version-control.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.