Go to file

William Duclot 0719f3eecd userdiff: add built-in pattern for CSS CSS is widely used, motivating it being included as a built-in pattern. It must be noted that the word_regex for CSS (i.e. the regex defining what is a word in the language) does not consider '.' and '#' characters (in CSS selectors) to be part of the word. This behavior is documented by the test t/t4018/css-rule. The logic behind this behavior is the following: identifiers in CSS selectors are identifiers in a HTML/XML document. Therefore, the '.'/'#' character are not part of the identifier, but an indicator of the nature of the identifier in HTML/XML (class or id). Diffing ".class1" and ".class2" must show that the class name is changed, but we still are selecting a class. Logic behind the "pattern" regex is: 1. reject lines ending with a colon/semicolon (properties) 2. if a line begins with a name in column 1, pick the whole line Credits to Johannes Sixt (j6t@kdbg.org) for the pattern regex and most of the tests. Signed-off-by: William Duclot <william.duclot@ensimag.grenoble-inp.fr> Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2016-06-03 14:45:56 -07:00
Documentation	userdiff: add built-in pattern for CSS	2016-06-03 14:45:56 -07:00
block-sha1	…
builtin	Merge branch 'js/name-rev-use-oldest-ref' into maint	2016-05-31 14:08:26 -07:00
ci	travis-ci: build documentation	2016-05-10 11:19:07 -07:00
compat	Merge branch 'js/windows-dotgit' into maint	2016-05-26 13:17:23 -07:00
contrib	git-multimail: update to release 1.3.0	2016-05-03 14:04:27 -07:00
ewah	…
git-gui	…
gitk-git	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	2016-03-20 18:05:10 -07:00
gitweb	Merge branch 'sk/gitweb-highlight-encoding' into HEAD	2016-05-18 14:40:10 -07:00
mergetools	…
perl	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
po	l10n-2.8.0-rnd3-fr	2016-04-25 13:36:26 -07:00
ppc	…
refs	set_worktree_head_symref(): fix error message	2016-04-08 10:26:23 -07:00
t	userdiff: add built-in pattern for CSS	2016-06-03 14:45:56 -07:00
templates	Merge branch 'ma/update-hooks-sample-typofix' into maint	2016-03-10 11:13:50 -08:00
vcs-svn	…
xdiff	Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint	2016-04-14 18:57:46 -07:00
.gitattributes	…
.gitignore	…
.mailmap	.mailmap: update to my shorter email address	2016-05-02 13:29:42 -07:00
.travis.yml	Merge branch 'ls/travis-build-doc' into maint	2016-05-26 13:17:25 -07:00
COPYING	…
GIT-VERSION-GEN	Git 2.8.3	2016-05-18 15:32:41 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'va/i18n-misc-updates' into maint	2016-05-26 13:17:20 -07:00
README.md	…
RelNotes	Git 2.8.3	2016-05-18 15:32:41 -07:00
abspath.c	Windows: shorten code by re-using convert_slashes()	2016-04-04 18:03:02 -07:00
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
archive-tar.c	archive-tar: convert snprintf to xsnprintf	2016-05-26 10:44:26 -07:00
archive-zip.c	…
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint	2016-04-14 18:37:15 -07:00
attr.h	…
base85.c	…
bisect.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
bisect.h	…
blob.c	…
blob.h	…
branch.c	branch -m: update all per-worktree HEADs	2016-04-04 12:57:22 -07:00
branch.h	branch -m: update all per-worktree HEADs	2016-04-04 12:57:22 -07:00
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	bundle: don't leak an fd in case of early return	2016-04-01 10:33:18 -07:00
bundle.h	…
cache-tree.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
cache-tree.h	…
cache.h	Merge branch 'js/windows-dotgit' into maint	2016-05-26 13:17:23 -07: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.h	…
config.c	Merge branch 'js/windows-dotgit' into maint	2016-05-26 13:17:23 -07:00
config.mak.in	…
config.mak.uname	Merge branch 'ad/cygwin-wants-rename' into maint	2016-05-02 14:24:12 -07:00
configure.ac	Merge branch 'ky/imap-send-openssl-1.1.0' into maint	2016-05-06 14:53:24 -07:00
connect.c	Merge branch 'cn/deprecate-ssh-git-url'	2016-03-16 13:16:40 -07:00
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'tb/conversion'	2016-02-26 13:37:23 -08:00
convert.h	…
copy.c	…
credential-cache--daemon.c	Merge branch 'jk/credential-cache-comment-exit' into maint	2016-04-14 18:37:16 -07:00
credential-cache.c	credential-cache, send_request: close fd when done	2016-04-01 10:33:18 -07:00
credential-store.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
diff.h	Merge branch 'maint-2.5' into maint-2.6	2016-03-17 11:26:18 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	Merge branch 'sg/diff-multiple-identical-renames' into maint	2016-04-29 14:15:55 -07:00
diffcore.h	…
dir.c	dir.c: remove dead function fnmatch_icase()	2016-04-22 14:07:45 -07:00
dir.h	dir.c: remove dead function fnmatch_icase()	2016-04-22 14:07:45 -07:00
editor.c	…
entry.c	…
environment.c	Merge branch 'js/windows-dotgit' into maint	2016-05-26 13:17:23 -07:00
exec_cmd.c	Merge branch 'ak/extract-argv0-last-dir-sep' into maint	2016-03-10 11:13:47 -08:00
exec_cmd.h	…
fast-import.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
fetch-pack.c	fetch-pack: isolate sigpipe in demuxer thread	2016-04-20 13:33:56 -07:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	fsck: detect and warn a commit with embedded NUL	2016-05-10 10:02:06 -07:00
fsck.h	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'ky/imap-send-openssl-1.1.0' into maint	2016-05-06 14:53:24 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
git-difftool--helper.sh	difftool/mergetool: make the form of yes/no questions consistent	2016-04-25 15:15:17 -07:00
git-difftool.perl	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	Merge branch 'jk/no-diff-emit-common' into maint	2016-03-10 11:13:42 -08:00
git-merge-resolve.sh	…
git-mergetool--lib.sh	difftool/mergetool: make the form of yes/no questions consistent	2016-04-25 15:15:17 -07:00
git-mergetool.sh	Merge branch 'nf/mergetool-prompt' into HEAD	2016-05-18 14:40:07 -07:00
git-p4.py	git-p4: fix Git LFS pointer parsing	2016-04-28 10:03:13 -07:00
git-parse-remote.sh	i18n: git-parse-remote.sh: mark strings for translation	2016-04-19 12:07:49 -07:00
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	rebase--interactive: avoid empty list in shell for-loop	2016-05-10 14:11:27 -07:00
git-rebase--merge.sh	…
git-rebase.sh	…
git-relink.perl	…
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'jd/send-email-to-whom' into HEAD	2016-05-18 14:40:07 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	sane_grep: pass "-a" if grep accepts it	2016-03-10 15:35:43 -08:00
git-stash.sh	…
git-submodule.sh	Merge branch 'sb/submodule-deinit-all' into maint	2016-05-31 14:09:46 -07:00
git-svn.perl	git-svn: fix URL canonicalization during init w/ SVN 1.7+	2016-03-16 20:16:23 +00:00
git-web--browse.sh	…
git.c	Merge branch 'ak/git-strip-extension-from-dashed-command' into maint	2016-03-10 11:13:48 -08:00
git.rc	…
git.spec.in	git.spec.in: use README.md, not README	2016-04-03 10:12:48 -07:00
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	Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7	2016-03-16 10:42:32 -07:00
http-walker.c	…
http.c	Merge branch 'bn/http-cookiefile-config' into maint	2016-05-31 14:08:28 -07:00
http.h	…
ident.c	Merge branch 'da/user-useconfigonly' into HEAD	2016-05-18 14:40:05 -07:00
imap-send.c	Merge branch 'ky/imap-send-openssl-1.1.0' into maint	2016-05-06 14:53:24 -07:00
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	Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7	2016-03-16 10:42:32 -07:00
list-objects.h	list-objects: pass full pathname to callbacks	2016-03-16 10:41:04 -07:00
ll-merge.c	…
ll-merge.h	…
lockfile.c	lockfile: improve error message when lockfile exists	2016-03-01 10:16:46 -08:00
lockfile.h	…
log-tree.c	…
log-tree.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	mailmap: do not resolve blobs in a non-repository	2016-03-06 17:19:11 -08:00
mailmap.h	…
match-trees.c	…
merge-blobs.c	Merge branch 'jk/no-diff-emit-common' into maint	2016-03-10 11:13:42 -08:00
merge-blobs.h	…
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
notes.h	…
object.c	…
object.h	…
pack-bitmap-write.c	Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7	2016-03-16 10:42:32 -07:00
pack-bitmap.c	Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7	2016-03-16 10:42:32 -07:00
pack-bitmap.h	…
pack-check.c	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	Merge branch 'jc/am-i-v-fix' into maint	2016-03-10 11:13:41 -08:00
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'lp/typofixes' into maint	2016-05-26 13:17:21 -07:00
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	…
prompt.h	…
quote.c	…
quote.h	…
reachable.c	Merge branch 'maint-2.5' into maint-2.6	2016-03-17 11:26:18 -07:00
reachable.h	…
read-cache.c	…
ref-filter.c	ref-filter.c: mark strings for translation	2016-02-29 14:27:58 -08:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	refs: add a new function set_worktree_head_symref	2016-04-04 12:57:21 -07:00
remote-curl.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
remote-testsvn.c	…
remote.c	Merge branch 'nd/remote-plural-ours-plus-theirs' into maint	2016-05-26 13:17:18 -07:00
remote.h	…
replace_object.c	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'maint-2.5' into maint-2.6	2016-03-17 11:26:18 -07:00
revision.h	Merge branch 'maint-2.5' into maint-2.6	2016-03-17 11:26:18 -07:00
run-command.c	Merge branch 'jk/push-client-deadlock-fix' into HEAD	2016-05-18 14:40:06 -07:00
run-command.h	Merge branch 'jk/push-client-deadlock-fix' into HEAD	2016-05-18 14:40:06 -07:00
send-pack.c	send-pack: isolate sigpipe in demuxer thread	2016-04-20 13:33:53 -07:00
send-pack.h	…
sequencer.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
sequencer.h	…
server-info.c	…
setup.c	Merge branch 'jc/xstrfmt-null-with-prec-0' into maint	2016-05-02 14:24:14 -07:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'jk/pack-idx-corruption-safety' into maint	2016-03-10 11:13:46 -08:00
sha1_name.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
split-index.h	…
strbuf.c	Merge branch 'jk/getwholeline-getdelim-empty' into maint	2016-04-14 18:57:46 -07:00
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	string_list: use string-list API in unsorted_string_list_lookup()	2016-04-25 11:48:27 -07:00
string-list.h	…
submodule-config.c	Merge branch 'sb/misc-cleanups' into HEAD	2016-05-18 14:40:15 -07:00
submodule-config.h	…
submodule.c	Merge branch 'jk/tighten-alloc' into maint	2016-03-10 11:13:43 -08:00
submodule.h	…
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
test-chmtime.c	…
test-config.c	…
test-ctype.c	…
test-date.c	…
test-delta.c	…
test-dump-cache-tree.c	…
test-dump-split-index.c	…
test-dump-untracked-cache.c	…
test-fake-ssh.c	…
test-genrandom.c	…
test-hashmap.c	…
test-index-version.c	…
test-line-buffer.c	…
test-match-trees.c	use setup_git_directory() in test-* programs	2016-03-07 12:27:35 -08:00
test-mergesort.c	…
test-mktemp.c	…
test-parse-options.c	…
test-path-utils.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
test-prio-queue.c	…
test-read-cache.c	…
test-regex.c	…
test-revision-walking.c	use setup_git_directory() in test-* programs	2016-03-07 12:27:35 -08:00
test-run-command.c	run-command: do not pass child process data into callbacks	2016-03-01 09:42:01 -08:00
test-scrap-cache-tree.c	…
test-sha1-array.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
test-string-list.c	…
test-submodule-config.c	…
test-subprocess.c	…
test-svn-fe.c	…
test-urlmatch-normalization.c	…
test-wildmatch.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
trace.h	…
trailer.c	trailer.c: mark strings for translation	2016-02-29 14:27:58 -08:00
trailer.h	…
transport-helper.c	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
transport.c	Merge branch 'cn/deprecate-ssh-git-url'	2016-03-16 13:16:40 -07:00
transport.h	…
tree-diff.c	Merge branch 'maint-2.4' into maint-2.5	2016-03-17 11:24:14 -07:00
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unicode_width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	i18n: unpack-trees: avoid substituting only a verb in sentences	2016-05-12 16:28:43 -07:00
unpack-trees.h	…
update_unicode.sh	…
upload-pack.c	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	userdiff: add built-in pattern for CSS	2016-06-03 14:45:56 -07:00
userdiff.h	…
utf8.c	…
utf8.h	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	…
walker.h	…
wildmatch.c	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
wildmatch.h	…
worktree.c	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	wrapper.c: delete dead function git_mkstemps()	2016-04-22 14:07:55 -07:00
write_or_die.c	…
ws.c	…
wt-status.c	Merge branch 'sb/misc-cleanups' into HEAD	2016-05-18 14:40:15 -07: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-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 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.

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