A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Stefan Beller 398dd4bd03 .mailmap: map different names with the same email address together
Pretty much one year ago (94b410bba8, Jul 12 2013, .mailmap: Map
email addresses to names) I cleaned up the output of `git shortlog
-sne` of git.git by writing a .mailmap file fot the git.git project.

During the year Jens, Kazuki and Trần contributed to git.git using
different names, but the same email address; unify them.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-07-17 10:48:09 -07:00
Documentation Sync with 2.0.2 2014-07-16 11:48:16 -07:00
block-sha1
builtin Sync with 2.0.2 2014-07-16 11:48:16 -07:00
compat MinGW: fix compile error due to missing ELOOP 2014-07-16 10:42:49 -07:00
contrib Merge branch 'ep/avoid-test-a-o' 2014-06-25 12:23:56 -07:00
ewah
git-gui Merge git://repo.or.cz/git-gui 2014-06-26 13:44:11 -07:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2014-06-27 11:23:03 -07:00
gitweb
mergetools
perl Merge branch 'mm/pager-less-sans-S' 2014-06-06 11:02:59 -07:00
po
ppc
t Merge branch 'jl/test-lint-scripts' 2014-07-16 11:33:01 -07:00
templates
vcs-svn
xdiff git-merge-file: do not add LF at EOF while applying unrelated change 2014-06-30 14:07:58 -07:00
.gitattributes
.gitignore Merge branch 'nd/split-index' 2014-07-16 11:25:40 -07:00
.mailmap .mailmap: map different names with the same email address together 2014-07-17 10:48:09 -07:00
COPYING
GIT-VERSION-GEN Git 2.0.2 2014-07-16 11:19:56 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'nd/split-index' 2014-07-16 11:25:40 -07:00
README
RelNotes Start preparing for 2.0.2 2014-07-10 11:15:10 -07:00
abspath.c
aclocal.m4
advice.c refactor skip_prefix to return a boolean 2014-06-20 10:44:43 -07:00
advice.h
alias.c use skip_prefix to avoid magic numbers 2014-06-20 10:44:45 -07:00
alloc.c commit: push commit_index update into alloc_commit_node 2014-06-12 10:29:42 -07:00
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c refactor skip_prefix to return a boolean 2014-06-20 10:44:43 -07:00
branch.h
builtin.h verify-commit: scriptable commit signature verification 2014-06-23 15:50:31 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c cache-tree: mark istate->cache_changed on prime_cache_tree() 2014-06-13 11:49:39 -07:00
cache-tree.h cache-tree: mark istate->cache_changed on prime_cache_tree() 2014-06-13 11:49:39 -07:00
cache.h Merge branch 'kb/path-max-must-go' 2014-07-16 11:32:33 -07:00
check-builtins.sh
check-racy.c
check_bindir check_bindir: avoid "test <cond> -a/-o <cond>" 2014-06-09 14:47:06 -07:00
color.c
color.h
column.c refactor skip_prefix to return a boolean 2014-06-20 10:44:43 -07:00
column.h
combine-diff.c Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint 2014-06-25 11:49:39 -07:00
command-list.txt verify-commit: scriptable commit signature verification 2014-06-23 15:50:31 -07:00
commit-slab.h commit-slab: provide a static initializer 2014-06-13 12:08:17 -07:00
commit.c Merge branch 'rs/code-cleaning' 2014-07-16 11:33:09 -07:00
commit.h reuse cached commit buffer when parsing signatures 2014-06-13 12:10:13 -07:00
config.c Merge branch 'ow/config-mailmap-pathname' into maint 2014-06-25 11:45:55 -07:00
config.mak.in
config.mak.uname Merge branch 'sk/mingw-dirent' 2014-07-09 11:34:27 -07:00
configure.ac
connect.c use skip_prefix to avoid magic numbers 2014-06-20 10:44:45 -07:00
connect.h
connected.c use strip_suffix instead of ends_with in simple cases 2014-06-30 13:43:17 -07:00
connected.h
convert.c use skip_prefix to avoid magic numbers 2014-06-20 10:44:45 -07:00
convert.h
copy.c
credential-cache--daemon.c refactor skip_prefix to return a boolean 2014-06-20 10:44:43 -07:00
credential-cache.c
credential-store.c
credential.c refactor skip_prefix to return a boolean 2014-06-20 10:44:43 -07:00
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'cc/replace-edit' 2014-07-16 11:25:47 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'jk/diff-files-assume-unchanged' into maint 2014-06-25 11:47:09 -07:00
diff-no-index.c
diff.c Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint 2014-06-25 11:47:23 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c cleanup duplicate name_compare() functions 2014-06-20 10:12:14 -07:00
dir.h
editor.c
entry.c read-cache: mark updated entries for split index 2014-06-13 11:49:40 -07:00
environment.c setup_git_env(): introduce git_path_from_env() helper 2014-06-25 10:33:27 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c fast-import: refactor parsing of spaces 2014-06-20 10:45:19 -07:00
fetch-pack.c Merge branch 'jk/skip-prefix' 2014-07-09 11:33:28 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c fsck: simplify fsck_commit_buffer() by using commit_list_count() 2014-07-10 14:10:27 -07:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh git-bisect.sh: avoid "test <cond> -a/-o <cond>" 2014-06-09 14:47:07 -07:00
git-compat-util.h Merge branch 'jk/strip-suffix' 2014-07-16 11:26:00 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: eliminate duplicate mapped parents 2014-07-01 08:30:41 -07:00
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh git-mergetool.sh: avoid "test <cond> -a/-o <cond>" 2014-06-09 14:47:07 -07:00
git-p4.py git-p4: fix submit in non --prepare-p4-only mode 2014-06-13 11:04:04 -07:00
git-parse-remote.sh
git-pull.sh Sync with maint 2014-06-12 12:22:38 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'ep/avoid-test-a-o' 2014-06-25 12:23:56 -07:00
git-rebase--merge.sh Merge branch 'bc/fix-rebase-merge-skip' into maint 2014-07-16 11:16:16 -07:00
git-rebase.sh Merge branch 'rr/rebase-autostash-fix' into maint 2014-06-25 11:49:31 -07:00
git-relink.perl
git-remote-testgit.sh Merge branch 'ep/shell-assign-and-export-vars' 2014-06-06 11:38:51 -07:00
git-request-pull.sh
git-send-email.perl Merge branch 'mt/send-email-cover-to-cc' 2014-06-20 13:12:20 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'ep/shell-assign-and-export-vars' 2014-06-06 11:38:51 -07:00
git-submodule.sh git-submodule.sh: avoid "echo" path-like values 2014-06-19 13:30:03 -07:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'mg/verify-commit' 2014-07-10 11:27:34 -07:00
git.rc
git.spec.in
gpg-interface.c gpg-interface: provide access to the payload 2014-06-23 15:50:30 -07:00
gpg-interface.h gpg-interface: provide access to the payload 2014-06-23 15:50:30 -07:00
graph.c
graph.h
grep.c
grep.h
hashmap.c
hashmap.h
help.c Merge branch 'jk/strip-suffix' 2014-07-16 11:26:00 -07:00
help.h
hex.c
http-backend.c use skip_prefix to avoid magic numbers 2014-06-20 10:44:45 -07:00
http-fetch.c
http-push.c Merge branch 'ah/fix-http-push' 2014-07-16 11:33:11 -07:00
http-walker.c use xstrfmt to replace xmalloc + sprintf 2014-06-19 15:20:54 -07:00
http.c Merge branch 'jk/skip-prefix' 2014-07-09 11:33:28 -07:00
http.h
ident.c
imap-send.c imap-send: use skip_prefix instead of using magic numbers 2014-06-20 10:45:19 -07:00
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c line-log: use commit_list_append() instead of duplicating its code 2014-07-08 11:01:53 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c read-cache: relocate and unexport commit_locked_index() 2014-06-13 11:49:38 -07:00
log-tree.c Merge branch 'zk/log-graph-showsig' 2014-07-16 11:32:57 -07:00
log-tree.h
mailmap.c
mailmap.h
match-trees.c use xstrfmt to replace xmalloc + sprintf 2014-06-19 15:20:54 -07:00
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'rs/code-cleaning' 2014-07-16 11:33:09 -07:00
merge-recursive.h
merge.c Merge branch 'nd/split-index' 2014-07-16 11:25:40 -07:00
mergesort.c
mergesort.h
name-hash.c name-hash.c: replace cache_name_compare() with memcmp(3) 2014-06-20 10:08:10 -07:00
notes-cache.c Merge branch 'jk/commit-buffer-length' 2014-07-02 12:53:02 -07:00
notes-cache.h
notes-merge.c commit: record buffer length in cache 2014-06-13 12:09:38 -07:00
notes-merge.h
notes-utils.c Merge branch 'jk/commit-buffer-length' 2014-07-02 12:53:02 -07:00
notes-utils.h commit_tree: take a pointer/len pair rather than a const strbuf 2014-06-12 10:29:41 -07:00
notes.c
notes.h
object.c commit: record buffer length in cache 2014-06-13 12:09:38 -07:00
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 Merge branch 'je/pager-do-not-recurse' 2014-06-06 11:17:00 -07:00
parse-options-cb.c
parse-options.c refactor skip_prefix to return a boolean 2014-06-20 10:44:43 -07:00
parse-options.h Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro' 2014-06-06 11:21:36 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Windows: allow using UNC path for git repository 2014-06-10 13:30:04 -07:00
pathspec.c use strbuf_addch for adding single characters 2014-07-10 14:06:46 -07:00
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c cache.h: rename cache_def_free to cache_def_clear 2014-07-13 10:12:37 -07:00
pretty.c Merge branch 'rs/code-cleaning' 2014-07-16 11:33:09 -07: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 'nd/split-index' 2014-07-16 11:25:40 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jk/strip-suffix' 2014-07-16 11:26:00 -07:00
refs.h Merge branch 'jl/remote-rm-prune' 2014-06-16 12:17:58 -07:00
remote-curl.c use skip_prefix to avoid repeating strings 2014-06-20 10:44:45 -07:00
remote-testsvn.c
remote.c Merge branch 'jk/xstrfmt' 2014-07-09 11:34:05 -07:00
remote.h
replace_object.c
rerere.c Merge branch 'rs/code-cleaning' 2014-07-16 11:33:09 -07:00
rerere.h
resolve-undo.c resolve-undo: be specific what part of the index has changed 2014-06-13 11:49:38 -07:00
resolve-undo.h
revision.c Merge branch 'jk/commit-buffer-length' into maint 2014-07-16 11:16:38 -07:00
revision.h
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'nd/split-index' 2014-07-16 11:25:40 -07: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 'jk/strip-suffix' 2014-07-16 11:26:00 -07:00
sha1_name.c use strbuf_addbuf for adding strbufs 2014-07-10 14:06:45 -07:00
shallow.c
shell.c use xstrfmt to replace xmalloc + strcpy/strcat 2014-06-19 15:20:54 -07:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c update-index: new options to enable/disable split index mode 2014-06-13 11:49:41 -07:00
split-index.h split-index: the reading part 2014-06-13 11:49:40 -07:00
strbuf.c Merge branch 'jk/strip-suffix' 2014-07-16 11:26:00 -07:00
strbuf.h Merge branch 'jk/strip-suffix' 2014-07-16 11:26:00 -07:00
streaming.c
streaming.h
string-list.c
string-list.h string-list: spell all values out that are given to a string_list initializer 2014-06-06 13:49:19 -07:00
submodule.c submodule.c: use the ARRAY_SIZE macro 2014-06-30 13:39:23 -07:00
submodule.h
symlinks.c symlinks: remove PATH_MAX limitation 2014-07-07 11:22:42 -07:00
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c cache-tree: mark istate->cache_changed on cache tree update 2014-06-13 11:49:39 -07:00
test-dump-split-index.c t1700: new tests for split-index mode 2014-06-13 11:49:42 -07:00
test-genrandom.c
test-hashmap.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c read-cache: new API write_locked_index instead of write_index/write_cache 2014-06-13 11:49:10 -07:00
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: avoid reading past end-of-string 2014-06-20 10:44:44 -07:00
transport.c refactor skip_prefix to return a boolean 2014-06-20 10:44:43 -07:00
transport.h
tree-diff.c
tree-walk.c cleanup duplicate name_compare() functions 2014-06-20 10:12:14 -07:00
tree-walk.h
tree.c
tree.h
unicode_width.h Update of unicode_width.h to Unicode Version 7.0 2014-06-18 10:53:45 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'nd/split-index' 2014-07-16 11:25:40 -07:00
unpack-trees.h
update_unicode.sh
upload-pack.c
url.c use strbuf_addch for adding single characters 2014-07-10 14:06:46 -07:00
url.h
urlmatch.c refactor skip_prefix to return a boolean 2014-06-20 10:44:43 -07:00
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c Merge branch 'tb/unicode-6.3-zero-width' 2014-06-06 11:29:38 -07:00
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c walker_fetch: fix minor memory leak 2014-06-19 15:20:56 -07:00
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'rs/status-code-clean-up' 2014-07-10 11:27:50 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

README

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

	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.