microsoft/git: A fork of Git containing Microsoft-specific patches. - git

A fork of Git containing Microsoft-specific patches.

Перейти к файлу

Junio C Hamano 84dd63ee1d Merge branch 'jk/pull-into-empty' * jk/pull-into-empty: pull: do not clobber untracked files on initial pull merge: merge unborn index before setting ref		2011-04-01 17:50:54 -07:00
Documentation	Merge branch 'maint'	2011-04-01 17:45:59 -07:00
block-sha1	…
builtin	Merge branch 'jk/pull-into-empty'	2011-04-01 17:50:54 -07:00
compat	Merge branch 'sp/maint-fd-limit' into maint	2011-03-20 22:11:46 -07:00
contrib	Merge branch 'maint'	2011-03-30 14:10:41 -07:00
git-gui	Merge git-gui 0.14.0	2011-03-26 10:42:35 -07:00
git_remote_helpers	remote-helpers: build in platform independent directory	2010-09-27 10:42:50 -07:00
gitk-git	Merge branch 'maint'	2011-01-08 23:48:47 -08:00
gitweb	Sync with 1.7.4.2	2011-03-25 17:57:08 -07:00
perl	perl: command_bidi_pipe() method should set-up git environmens	2011-02-14 15:28:13 -08:00
po	i18n: Makefile: "pot" target to extract messages marked for translation	2011-03-09 23:52:52 -08:00
ppc	…
t	Merge branch 'jk/pull-into-empty'	2011-04-01 17:50:54 -07:00
templates	…
vcs-svn	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn	2011-03-30 10:49:13 -07:00
xdiff	Merge branch 'cb/diff-fname-optim' into maint	2010-11-24 12:46:26 -08:00
.gitattributes	…
.gitignore	gitignore: add test-mktemp to ignore list	2011-02-13 15:15:08 -08:00
.mailmap	Martin Langhoff has a new e-mail address	2010-10-06 12:08:48 -07:00
COPYING	…
GIT-VERSION-GEN	Git 1.7.5-rc0	2011-03-31 13:58:47 -07:00
INSTALL	docs: default to more modern toolset	2010-11-24 15:13:58 -08:00
Makefile	Merge branch 'sb/sparse-more'	2011-04-01 17:50:20 -07:00
README	…
RelNotes	Prepare draft release notes to 1.7.4.2	2011-03-16 16:47:40 -07:00
abspath.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
aclocal.m4	configure: use AC_LANG_PROGRAM consistently	2011-02-14 10:55:15 -08:00
advice.c	…
advice.h	…
alias.c	…
alloc.c	unbreak and eliminate NO_C99_FORMAT	2011-03-17 15:30:49 -07:00
archive-tar.c	…
archive-zip.c	…
archive.c	archive: improve --verbose description	2010-11-15 10:05:38 -08:00
archive.h	…
attr.c	gitattributes: drop support for GIT_ATTR_NOGLOBAL	2011-03-15 12:23:29 -07:00
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'jh/maint-do-not-track-non-branches'	2011-03-15 14:22:13 -07:00
branch.h	Change incorrect "remote branch" to "remote tracking branch" in C code	2010-11-03 09:20:47 -07:00
builtin.h	repo-config: add deprecation warning	2011-02-13 15:13:41 -08:00
bundle.c	bundle: Use OFS_DELTA in bundle files	2011-02-06 22:50:26 -08:00
bundle.h	…
cache-tree.c	cache_tree_free: Fix small memory leak	2010-09-06 17:32:28 -07:00
cache-tree.h	…
cache.h	Merge branch 'jc/index-update-if-able'	2011-03-26 20:13:16 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	wt-status: add helpers for printing wt-status lines	2011-03-08 12:12:42 -08:00
color.h	wt-status: add helpers for printing wt-status lines	2011-03-08 12:12:42 -08:00
combine-diff.c	…
command-list.txt	…
commit.c	Add const to parse_{commit,tag}_buffer()	2011-02-07 15:04:42 -08:00
commit.h	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
config.c	Merge branch 'lt/default-abbrev'	2011-03-23 14:55:40 -07:00
config.mak.in	unbreak and eliminate NO_C99_FORMAT	2011-03-17 15:30:49 -07:00
configure.ac	Improve test for pthreads flag	2011-03-28 10:54:54 -07:00
connect.c	Make sure that git_getpass() never returns NULL	2010-09-30 12:22:02 -07:00
convert.c	enums: omit trailing comma for portability	2011-03-16 12:31:32 -07:00
copy.c	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'jc/maint-diff-q-filter' into maint	2011-04-01 16:23:34 -07:00
diff-no-index.c	Convert struct diff_options to use struct pathspec	2011-02-03 12:28:15 -08:00
diff.c	Remove unused variables	2011-03-22 11:43:27 -07:00
diff.h	Merge branch 'jk/merge-rename-ux'	2011-03-19 23:23:56 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	diffcore-pickaxe.c: a void function shouldn't try to return something	2010-10-06 13:45:18 -07:00
diffcore-rename.c	Merge branch 'jk/merge-rename-ux'	2011-03-19 23:23:56 -07:00
diffcore.h	…
dir.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
dir.h	pathspec: add match_pathspec_depth()	2011-02-03 14:08:30 -08:00
editor.c	…
entry.c	entry.c: remove "checkout-index" from error messages	2010-11-29 14:03:07 -08:00
environment.c	Merge branch 'lt/default-abbrev'	2011-03-23 14:55:40 -07:00
exec_cmd.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
exec_cmd.h	…
fast-import.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
fetch-pack.h	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
fixup-builtins	…
fsck.c	strbuf: add strbuf_vaddf	2011-02-26 01:06:50 -08:00
fsck.h	…
generate-cmdlist.sh	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
gettext.c	i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set	2011-03-08 12:10:03 -08:00
gettext.h	i18n: add stub Q_() wrapper for ngettext	2011-03-09 23:50:57 -08:00
git-add--interactive.perl	Merge branch 'jl/add-p-reverse-message' into maint	2010-12-09 10:36:47 -08:00
git-am.sh	Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint	2010-12-28 13:43:10 -08:00
git-archimport.perl	perl: use "use warnings" instead of -w	2010-09-27 12:37:56 -07:00
git-bisect.sh	bisect: visualize with git-log if gitk is unavailable	2011-03-21 10:23:45 -07:00
git-compat-util.h	Merge branch 'mr/hpux' into maint	2011-03-20 22:11:15 -07:00
git-cvsexportcommit.perl	perl: use "use warnings" instead of -w	2010-09-27 12:37:56 -07:00
git-cvsimport.perl	git-cvsimport.perl: Bail out right away when reading from the server fails	2011-02-27 02:13:21 -08:00
git-cvsserver.perl	Merge branch 'ab/require-perl-5.8'	2010-10-26 21:57:31 -07:00
git-difftool--helper.sh	difftool: provide basename to external tools	2010-12-16 13:01:36 -08:00
git-difftool.perl	difftool: Fix failure on Cygwin	2010-12-14 11:13:41 -08:00
git-filter-branch.sh	…
git-instaweb.sh	git-instaweb: Change how gitweb.psgi is made runnable as standalone app	2011-02-27 22:02:31 -08:00
git-lost-found.sh	…
git-merge-octopus.sh	merge-octopus: Work around environment issue on Windows	2010-10-01 23:08:46 +01:00
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	Merge branch 'ss/mergetool--lib'	2011-03-19 23:24:27 -07:00
git-mergetool.sh	mergetool: don't skip modify/remove conflicts	2011-02-16 13:21:09 -08:00
git-parse-remote.sh	Merge branch 'maint'	2011-03-30 19:33:53 -07:00
git-pull.sh	pull: do not clobber untracked files on initial pull	2011-03-25 14:16:27 -07:00
git-quiltimport.sh	…
git-rebase--interactive.sh	Merge branch 'maint'	2011-01-27 10:27:49 -08:00
git-rebase.sh	Merge branch 'maint'	2011-01-27 10:27:49 -08:00
git-relink.perl	Merge branch 'ab/require-perl-5.8' into maint	2010-12-09 10:35:21 -08:00
git-remote-testgit.py	…
git-repack.sh	Merge branch 'tr/maint-git-repack-tmpfile' into maint	2010-11-24 12:47:10 -08:00
git-request-pull.sh	git-request-pull: open-code the only invocation of get_remote_url	2011-03-02 12:26:58 -08:00
git-send-email.perl	Merge branch 'ab/require-perl-5.8' into maint	2010-12-09 10:35:21 -08:00
git-sh-setup.sh	Porcelain scripts: Rewrite cryptic "needs update" error message	2010-10-28 13:28:44 -07:00
git-stash.sh	Merge branch 'pk/stash-apply-status-relative' into maint	2011-04-01 16:23:43 -07:00
git-submodule.sh	submodule: no [--merge\|--rebase] when newly cloned	2011-02-17 12:19:18 -08:00
git-svn.perl	git-log: put space after commit mark	2011-03-10 21:55:29 -08:00
git-web--browse.sh	web--browse: better support for chromium	2010-12-03 14:05:32 -08:00
git.c	git.c: reorder builtin command list	2011-02-15 13:46:18 -08:00
git.spec.in	…
graph.c	rev-list/log: factor out revision mark generation	2011-03-09 13:50:54 -08:00
graph.h	…
grep.c	log --author: take union of multiple "author" requests	2010-09-13 01:11:55 -07:00
grep.h	log --author: take union of multiple "author" requests	2010-09-13 01:11:55 -07:00
hash.c	for_each_hash: allow passing a 'void *data' pointer to callback	2011-02-18 22:25:51 -08:00
hash.h	for_each_hash: allow passing a 'void *data' pointer to callback	2011-02-18 22:25:51 -08:00
help.c	help: always suggest common-cmds if prefix of cmd	2010-12-05 12:15:12 -08:00
help.h	…
hex.c	…
http-backend.c	http-backend: use end_url_with_slash()	2010-11-26 14:50:45 -08:00
http-fetch.c	http-fetch: rework url handling	2010-11-26 14:50:46 -08:00
http-push.c	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
http-walker.c	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
http.c	Merge branch 'tc/http-urls-ends-with-slash' into maint	2010-12-14 07:36:10 -08:00
http.h	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
ident.c	ident: die on bogus date format	2010-12-20 10:28:19 -08:00
imap-send.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
levenshtein.c	…
levenshtein.h	…
list-objects.c	Merge branch 'jc/maint-rev-list-culled-boundary'	2011-03-22 21:37:59 -07:00
list-objects.h	…
ll-merge.c	ll-merge: simplify opts == NULL case	2011-01-15 20:34:14 -08:00
ll-merge.h	…
lockfile.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
log-tree.c	git-log: put space after commit mark	2011-03-10 21:55:29 -08:00
log-tree.h	…
mailmap.c	mailmap: fix use of freed memory	2010-10-13 19:11:26 -07:00
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-recursive.c	Merge branch 'jk/merge-rename-ux'	2011-03-19 23:23:56 -07:00
merge-recursive.h	Merge branch 'jk/merge-rename-ux'	2011-03-19 23:23:56 -07:00
name-hash.c	Add case insensitivity support for directories when using git status	2010-10-06 11:19:58 -07:00
notes-cache.c	notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond	2010-11-17 13:21:02 -08:00
notes-cache.h	…
notes-merge.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
notes-merge.h	git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"	2010-11-17 13:22:53 -08:00
notes.c	Merge branch 'jh/notes-merge'	2010-12-08 11:24:12 -08:00
notes.h	Merge branch 'jh/notes-merge'	2010-12-08 11:24:12 -08:00
object.c	Merge branch 'maint'	2010-09-06 00:12:04 -07:00
object.h	object.h: Remove obsolete struct object_refs	2011-03-14 10:49:28 -07:00
pack-check.c	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	…
parse-options.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
parse-options.h	Make <identifier> lowercase as per CodingGuidelines	2011-02-15 11:53:09 -08:00
patch-delta.c	compat: helper for detecting unsigned overflow	2011-02-10 13:47:56 -08:00
patch-ids.c	…
patch-ids.h	…
path.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
pkt-line.c	add packet tracing debug code	2011-03-08 12:12:04 -08:00
pkt-line.h	…
preload-index.c	Convert ce_path_match() to use struct pathspec	2011-02-03 14:08:30 -08:00
pretty.c	Merge branch 'mg/rev-list-one-side-only'	2011-03-22 21:38:50 -07:00
progress.c	…
progress.h	…
quote.c	…
quote.h	quote.h: simplify the inclusion	2011-02-07 15:15:17 -08:00
reachable.c	Remove unused variables	2011-03-22 11:43:27 -07:00
reachable.h	…
read-cache.c	Merge branch 'jc/index-update-if-able'	2011-03-26 20:13:16 -07:00
reflog-walk.c	Merge branch 'jk/maint-reflog-bottom' into maint	2010-12-14 07:35:50 -08:00
reflog-walk.h	…
refs.c	…
refs.h	…
remote-curl.c	Merge branch 'sp/maint-smart-http-sans-100-continue'	2011-03-14 11:59:10 -07:00
remote.c	Change "tracking branch" to "remote-tracking branch"	2010-11-03 09:20:41 -07:00
remote.h	…
replace_object.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
rerere.c	Merge branch 'jc/maint-rerere-in-workdir'	2011-03-26 20:13:16 -07:00
rerere.h	rerere "remaining"	2011-02-16 13:20:50 -08:00
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'mg/rev-list-n-parents'	2011-03-26 20:13:17 -07:00
revision.h	Merge branch 'mg/rev-list-n-parents'	2011-03-26 20:13:17 -07:00
run-command.c	run-command: prettify -D_FORTIFY_SOURCE workaround	2011-03-17 15:32:43 -07:00
run-command.h	…
send-pack.h	push: pass --progress down to git-pack-objects	2010-10-18 16:20:19 -07:00
server-info.c	…
setup.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'jc/maint-rerere-in-workdir'	2011-03-26 20:13:16 -07:00
sha1_name.c	Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"	2011-03-10 22:41:14 -08:00
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	strbuf: add strbuf_vaddf	2011-02-26 01:06:50 -08:00
strbuf.h	Merge branch 'maint'	2011-03-30 14:10:41 -07:00
string-list.c	string_list_append: always set util pointer to NULL	2011-02-14 10:55:03 -08:00
string-list.h	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
submodule.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
submodule.h	Add the 'fetch.recurseSubmodules' config setting	2010-11-12 15:06:03 -08:00
symlinks.c	do not overwrite untracked symlinks	2011-02-21 22:51:07 -08:00
tag.c	parse_tag_buffer(): do not prefixcmp() out of range	2011-02-16 10:05:14 -08:00
tag.h	Add const to parse_{commit,tag}_buffer()	2011-02-07 15:04:42 -08:00
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	vcs-svn: remove buffer_read_string	2011-03-26 00:17:35 -05:00
test-match-trees.c	…
test-mktemp.c	Improve error messages when temporary file creation fails	2010-12-21 19:51:17 -08:00
test-obj-pool.c	…
test-parse-options.c	Make <identifier> lowercase as per CodingGuidelines	2011-02-15 11:53:11 -08:00
test-path-utils.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
test-run-command.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
test-string-pool.c	…
test-subprocess.c	Remove unused variables	2011-03-22 11:43:27 -07:00
test-svn-fe.c	vcs-svn: Check for errors from open()	2010-11-24 14:51:42 -08:00
test-treap.c	treap: make treap_insert return inserted node	2010-12-07 16:03:55 -08:00
thread-utils.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
thread-utils.h	thread-utils.h: simplify the inclusion	2010-12-10 12:58:06 -08:00
trace.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
transport-helper.c	Remove unused variables	2011-03-22 11:43:27 -07:00
transport.c	Merge branch 'jc/maint-fetch-alt'	2011-03-22 21:37:53 -07:00
transport.h	refs_from_alternate: helper to use refs from alternates	2011-03-17 16:18:47 -07:00
tree-diff.c	Remove unused variables	2011-03-22 11:43:27 -07:00
tree-walk.c	grep: drop pathspec_matches() in favor of tree_entry_interesting()	2011-02-03 14:08:31 -08:00
tree-walk.h	grep: drop pathspec_matches() in favor of tree_entry_interesting()	2011-02-03 14:08:31 -08:00
tree.c	…
tree.h	…
unimplemented.sh	…
unpack-trees.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
unpack-trees.h	use persistent memory for rejected paths	2010-12-14 08:55:13 -08:00
upload-pack.c	Merge branches 'sp/maint-fetch-pack-stop-early' and 'sp/maint-upload-pack-stop-early'	2011-03-29 14:09:02 -07:00
url.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
url.h	url: add str wrapper for end_url_with_slash()	2010-11-26 14:50:45 -08:00
usage.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
userdiff.c	Merge branch 'tr/diff-words-test'	2011-02-09 16:41:17 -08:00
userdiff.h	…
utf8.c	strbuf: add fixed-length version of add_wrapped_text	2011-02-23 13:44:36 -08:00
utf8.h	strbuf: add fixed-length version of add_wrapped_text	2011-02-23 13:44:36 -08:00
walker.c	commit: Add commit_list prefix in two function names.	2010-11-29 14:01:52 -08:00
walker.h	…
wrap-for-bin.sh	…
wrapper.c	Merge branch 'ae/better-template-failure-report' into maint	2011-03-20 22:09:39 -07:00
write_or_die.c	…
ws.c	Make the tab width used for whitespace checks configurable	2010-12-01 14:47:51 -08:00
wt-status.c	Merge branch 'jn/status-translatable'	2011-03-19 23:24:19 -07:00
wt-status.h	Merge branch 'jn/status-translatable'	2011-03-19 23:24:19 -07:00
xdiff-interface.c	Merge branch 'rs/maint-diff-fd-leak' into maint	2010-12-26 11:18:39 -08:00
xdiff-interface.h	…
zlib.c	wrapper: give zlib wrappers their own translation unit	2010-11-10 11:07:51 -08:00

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.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

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. 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://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.