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

A fork of Git containing Microsoft-specific patches.

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

Junio C Hamano c3502fa882 revision: do not include sibling history in --ancestry-path output If the commit specified as the bottom of the commit range has a direct parent that has another child commit that contributed to the resulting history, "rev-list --ancestry-path" was confused and listed that side history as well, due to the command line parser subtlety corrected by the previous commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>		2011-08-25 19:40:51 -07:00
Documentation	Documentation/rev-list-options.txt: Explain --ancestry-path	2010-06-06 10:16:31 -07:00
block-sha1	…
builtin	Merge branch 'maint'	2010-04-19 22:41:30 -07:00
compat	Merge branch 'maint'	2010-04-19 22:41:30 -07:00
contrib	Merge branch 'sg/bash-completion'	2010-04-06 14:50:45 -07:00
git-gui	Merge git://repo.or.cz/git-gui	2010-02-07 15:52:28 -08:00
git_remote_helpers	Correct references to /usr/bin/python which does not exist on FreeBSD	2010-03-24 14:33:54 -07:00
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	2010-04-18 18:36:41 -07:00
gitweb	gitweb: simplify gitweb.min.* generation and clean-up rules	2010-04-17 12:40:19 -07:00
perl	git-svn: support fetch with autocrlf on	2010-03-05 02:57:57 -08:00
ppc	…
t	revision: do not include sibling history in --ancestry-path output	2011-08-25 19:40:51 -07:00
templates	Modernize git calling conventions in hook templates	2010-03-20 09:04:38 -07:00
xdiff	xdl_merge(): move file1 and file2 labels to xmparam structure	2010-03-20 20:36:10 -07:00
.gitattributes	.gitattributes: detect 8-space indent in shell scripts	2010-01-06 12:22:25 -08:00
.gitignore	Add .depend directories to .gitignore	2010-04-15 00:53:08 -07:00
.mailmap	Merge branch 'mg/mailmap-update' into maint	2010-04-09 22:22:06 -07:00
COPYING	Update COPYING with GPLv2 with new FSF address	2010-01-17 14:29:37 -08:00
GIT-VERSION-GEN	Git 1.7.1-rc2	2010-04-18 22:19:04 -07:00
INSTALL	…
Makefile	Merge branch 'mr/gitweb-jsmin'	2010-04-10 13:02:22 -07:00
README	…
RelNotes	Git 1.7.0.5	2010-04-11 13:42:33 -07:00
abspath.c	make_absolute_path(): Do not append redundant slash	2010-02-14 13:21:31 -08:00
advice.c	Reword "detached HEAD" notification	2010-01-29 22:11:00 -08:00
advice.h	Reword "detached HEAD" notification	2010-01-29 22:11:00 -08:00
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	Merge branch 'jc/conflict-marker-size'	2010-01-20 20:28:51 -08:00
archive.h	…
attr.c	git_attr(): fix function signature	2010-01-16 20:39:59 -08:00
attr.h	git_attr(): fix function signature	2010-01-16 20:39:59 -08:00
base85.c	Merge branch 'maint-1.6.2' into maint-1.6.3	2010-01-18 21:29:47 -08:00
bisect.c	Merge branch 'cc/maint-bisect-paths' into maint-1.6.6	2010-03-07 14:53:35 -08:00
bisect.h	builtin-rev-list.c: mark file-local function static	2010-01-11 23:16:16 -08:00
blob.c	Replace parse_blob() with an explanatory comment	2010-01-18 17:04:02 -08:00
blob.h	Replace parse_blob() with an explanatory comment	2010-01-18 17:04:02 -08:00
branch.c	Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint	2010-04-11 13:39:47 -07:00
branch.h	…
builtin.h	notes: implement helpers needed for note copying during rewrite	2010-03-12 21:55:39 -08:00
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	fix const-correctness of write_sha1_file	2010-04-01 23:49:03 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	Merge branch 'jc/color-attrs' into maint	2010-03-24 16:24:13 -07:00
color.h	Merge branch 'jc/color-attrs' into maint	2010-03-24 16:24:13 -07:00
combine-diff.c	combined diff: correctly handle truncated file	2010-04-17 10:23:59 -07:00
command-list.txt	…
commit.c	Merge branch 'maint-1.6.5' into maint	2010-01-29 23:36:13 -08:00
commit.h	pretty: Initialize notes if %N is used	2010-04-13 18:15:08 -07:00
config.c	Merge branch 'jc/ident'	2010-01-20 14:39:52 -08:00
config.mak.in	Make NO_PTHREADS the sole thread configuration variable	2010-01-31 11:50:50 -08:00
configure.ac	Gitweb: add autoconfigure support for minifiers	2010-04-02 21:23:38 -07:00
connect.c	Merge branch 'fl/askpass'	2010-03-20 11:29:35 -07:00
convert.c	Merge branch 'sp/maint-push-sideband' into maint	2010-03-02 22:54:50 -08:00
copy.c	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	Merge branch 'bc/maint-daemon-sans-ss-family' into maint	2010-04-09 22:22:00 -07:00
date.c	Merge branch 'jc/maint-reflog-bad-timestamp'	2010-01-27 14:57:37 -08:00
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'jl/submodule-diff-dirtiness'	2010-03-24 16:25:43 -07:00
diff-no-index.c	…
diff.c	Merge branch 'jk/maint-diffstat-overflow'	2010-04-18 21:31:50 -07:00
diff.h	git status: ignoring untracked files must apply to submodules too	2010-03-13 21:56:35 -08:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	git diff --submodule: Show detailed dirty status of submodules	2010-03-04 22:16:33 -08:00
dir.c	Merge branch 'jk/maint-add-ignored-dir' into maint	2010-03-24 16:24:03 -07:00
dir.h	Merge branch 'nd/sparse'	2010-01-13 11:58:34 -08:00
editor.c	…
entry.c	Merge branch 'jc/symbol-static'	2010-01-20 14:37:25 -08:00
environment.c	Refactor list of of repo-local env vars	2010-02-24 16:24:25 -08:00
exec_cmd.c	Print RUNTIME_PREFIX warning only when GIT_TRACE is set	2010-02-23 13:20:15 -08:00
exec_cmd.h	…
fast-import.c	refactor duplicated encode_header in pack-objects and fast-import	2010-02-17 15:30:20 -08:00
fetch-pack.h	…
fixup-builtins	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	Merge branch 'jk/maint-add--interactive-delete' into maint	2010-03-08 00:36:00 -08:00
git-am.sh	Merge branch 'tr/notes-display'	2010-03-24 16:26:43 -07:00
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'jn/merge-diff3-label'	2010-04-03 12:28:41 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	cvsimport: new -R option: generate .git/cvs-revisions mapping	2010-02-06 11:01:59 -08:00
git-cvsserver.perl	Merge branch 'gp/maint-cvsserver'	2010-01-28 00:46:33 -08:00
git-difftool--helper.sh	Make difftool.prompt fall back to mergetool.prompt	2010-01-22 15:57:45 -08:00
git-difftool.perl	difftool: Fix '--gui' when diff.guitool is unconfigured	2010-03-28 09:29:12 -07:00
git-filter-branch.sh	Merge branch 'maint'	2010-02-11 23:06:32 -08:00
git-instaweb.sh	git-instaweb: pass through invoking user's path to gitweb CGI scripts	2010-04-17 12:40:20 -07:00
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	add shebang line to git-mergetool--lib.sh	2010-01-29 09:56:51 -08:00
git-mergetool.sh	…
git-parse-remote.sh	Do not install shell libraries executable	2010-01-31 11:53:10 -08:00
git-pull.sh	Merge branch 'maint'	2010-03-20 11:29:19 -07:00
git-quiltimport.sh	…
git-rebase--interactive.sh	rebase-interactive: silence warning when no commits rewritten	2010-04-18 11:41:53 -07:00
git-rebase.sh	Merge branch 'mb/rebase-i-no-ff'	2010-04-03 12:28:44 -07:00
git-relink.perl	…
git-repack.sh	…
git-request-pull.sh	request-pull: avoid mentioning that the start point is a single commit	2010-01-29 22:26:39 -08:00
git-send-email.perl	Merge branch 'mg/maint-send-email-lazy-editor' into maint	2010-04-09 22:23:04 -07:00
git-sh-setup.sh	Merge branch 'gb/maint-submodule-env' into maint	2010-03-08 00:36:02 -08:00
git-stash.sh	Improve error messages from 'git stash show'	2010-03-16 19:23:24 -07:00
git-submodule.sh	Merge branch 'jh/maint-submodule-status-in-void'	2010-03-24 16:55:37 -07:00
git-svn.perl	Merge branch 'fl/askpass'	2010-03-20 11:29:35 -07:00
git-web--browse.sh	…
git.c	Merge branch 'jh/notes'	2010-03-15 00:52:06 -07:00
git.spec.in	RPM spec: include bash completion support	2010-03-29 09:40:06 -07:00
graph.c	Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*	2010-03-07 11:09:02 -08:00
graph.h	…
grep.c	Merge branch 'rs/threaded-grep-context'	2010-04-03 12:28:39 -07:00
grep.h	Merge branch 'ml/color-grep'	2010-03-20 11:29:36 -07:00
hash.c	…
hash.h	…
help.c	Remove hyphen from "git-command" in two error messages	2010-02-15 18:20:54 -08:00
help.h	…
hex.c	slim down "git show-index"	2010-01-21 20:03:45 -08:00
http-backend.c	http-backend: Don't infinite loop during die()	2010-03-24 14:40:56 -07:00
http-fetch.c	http: init and cleanup separately from http-walker	2010-03-02 11:10:36 -08:00
http-push.c	http-push: remove "\|\| 1" to enable verbose check	2010-03-02 11:10:36 -08:00
http-walker.c	http: init and cleanup separately from http-walker	2010-03-02 11:10:36 -08:00
http.c	git-core: Support retrieving passwords with GIT_ASKPASS	2010-03-04 22:05:13 -08:00
http.h	http.c: mark file-local functions static	2010-01-12 01:06:08 -08:00
ident.c	ident.c: replace fprintf with fputs to suppress compiler warning	2010-01-19 15:25:38 -08:00
imap-send.c	Merge branch 'rr/imap-send-unconfuse-from-line'	2010-04-03 12:28:42 -07:00
levenshtein.c	…
levenshtein.h	Typofixes outside documentation area	2010-02-03 21:28:17 -08:00
list-objects.c	…
list-objects.h	…
ll-merge.c	ll_merge(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
ll-merge.h	ll_merge(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
lockfile.c	lockfile: show absolute filename in unable_to_lock_message	2010-01-12 15:48:24 -08:00
log-tree.c	git log -p -m: document -m and honor --first-parent	2010-02-12 11:32:23 -08:00
log-tree.h	…
mailmap.c	mailmap.c: remove unused function	2010-01-12 01:06:09 -08:00
mailmap.h	mailmap.c: remove unused function	2010-01-12 01:06:09 -08:00
match-trees.c	Make "subtree" part more orthogonal to the rest of merge-recursive.	2010-01-17 22:46:28 -08:00
merge-file.c	merge_file(): add comment explaining behavior wrt conflict style	2010-03-20 20:36:11 -07:00
merge-recursive.c	merge-recursive: add a label for ancestor	2010-03-20 20:36:11 -07:00
merge-recursive.h	merge_trees(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
name-hash.c	…
notes.c	Merge branch 'tr/notes-display'	2010-03-24 16:26:43 -07:00
notes.h	notes.h: declare bit field as unsigned to silence compiler complaints	2010-04-06 21:55:50 -07:00
object.c	object.c: remove unused functions	2010-01-17 22:49:36 -08:00
object.h	object.c: remove unused functions	2010-01-17 22:49:36 -08:00
pack-check.c	…
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	move encode_in_pack_object_header() to a better place	2010-02-23 13:10:56 -08:00
pack.h	move encode_in_pack_object_header() to a better place	2010-02-23 13:10:56 -08:00
pager.c	Make 'git var GIT_PAGER' always print the configured pager	2010-02-14 18:23:17 -08:00
parse-options.c	parse-options: add parse_options_concat() to concat options	2010-03-06 23:58:33 -08:00
parse-options.h	parse-options: add parse_options_concat() to concat options	2010-03-06 23:58:33 -08:00
patch-delta.c	Fix integer overflow in patch_delta()	2010-01-26 12:57:59 -08:00
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'mm/mkstemps-mode-for-packfiles' into maint	2010-03-08 00:36:00 -08:00
pkt-line.c	…
pkt-line.h	…
preload-index.c	Make ce_uptodate() trustworthy again	2010-01-24 00:15:29 -08:00
pretty.c	pretty: Initialize notes if %N is used	2010-04-13 18:15:08 -07:00
progress.c	…
progress.h	…
quote.c	Fix invalid read in quote_c_style_counted	2010-02-06 10:55:03 -08:00
quote.h	quote.c: mark file-local function static	2010-01-12 01:06:08 -08:00
reachable.c	…
reachable.h	…
read-cache.c	Correct spelling of 'REUC' extension	2010-02-02 09:54:34 -08:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'jc/maint-refs-dangling' into maint	2010-03-31 15:09:32 -07:00
refs.h	Support showing notes from more than one notes tree	2010-03-12 21:55:39 -08:00
remote-curl.c	Merge branch 'tc/http-cleanup'	2010-03-15 00:58:50 -07:00
remote.c	refactor ref status logic for pushing	2010-01-09 23:34:10 -08:00
remote.h	refactor ref status logic for pushing	2010-01-09 23:34:10 -08:00
replace_object.c	…
rerere.c	ll_merge(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
rerere.h	Merge branch 'jc/cache-unmerge'	2010-01-20 14:46:35 -08:00
resolve-undo.c	build: make code "-Wpointer-arith" clean	2010-02-01 22:04:03 -08:00
resolve-undo.h	build: make code "-Wpointer-arith" clean	2010-02-01 22:04:03 -08:00
revision.c	revision: do not include sibling history in --ancestry-path output	2011-08-25 19:40:51 -07:00
revision.h	revision: keep track of the end-user input from the command line	2011-08-25 17:35:44 -07:00
run-command.c	Merge branch 'jl/maint-submodule-gitfile-awareness'	2010-04-11 13:54:28 -07:00
run-command.h	Merge branch 'sp/maint-push-sideband' into maint	2010-03-02 22:54:50 -08:00
send-pack.h	git-push: make git push --porcelain print "Done"	2010-02-28 10:39:30 -08:00
server-info.c	…
setup.c	Merge branch 'nd/root-git'	2010-03-07 12:47:15 -08:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	fix const-correctness of write_sha1_file	2010-04-01 23:49:03 -07:00
sha1_name.c	sha1_name: fix segfault caused by invalid index access	2010-02-28 10:32:06 -08:00
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	slim down "git show-index"	2010-01-21 20:03:45 -08:00
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	Merge branch 'ap/merge-backend-opts'	2010-01-20 20:28:50 -08:00
strbuf.h	Merge branch 'jc/maint-strbuf-add-fix-doubling'	2010-01-20 14:43:09 -08:00
string-list.c	string-list: add unsorted_string_list_lookup()	2010-03-24 19:41:19 -07:00
string-list.h	string-list: add unsorted_string_list_lookup()	2010-03-24 19:41:19 -07:00
submodule.c	Teach diff --submodule and status to handle .git files in submodules	2010-04-10 11:51:56 -07:00
submodule.h	git status: ignoring untracked files must apply to submodules too	2010-03-13 21:56:35 -08:00
symlinks.c	symlinks.c: remove unused functions	2010-01-17 22:49:36 -08:00
tag.c	…
tag.h	…
tar.h	…
test-chmtime.c	Typofixes outside documentation area	2010-02-03 21:28:17 -08:00
test-ctype.c	…
test-date.c	…
test-delta.c	…
test-dump-cache-tree.c	…
test-genrandom.c	…
test-index-version.c	…
test-match-trees.c	…
test-parse-options.c	…
test-path-utils.c	…
test-run-command.c	start_command: detect execvp failures early	2010-01-10 10:15:03 -08:00
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport-helper.c	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
transport.c	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
transport.h	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
tree-diff.c	Performance optimization for detection of modified submodules	2010-01-18 17:28:21 -08:00
tree-walk.c	Merge branch 'maint-1.6.6' into maint	2010-02-14 18:59:14 -08:00
tree-walk.h	…
tree.c	…
tree.h	…
unimplemented.sh	…
unpack-trees.c	Merge branch 'jc/fix-tree-walk'	2010-01-24 17:35:58 -08:00
unpack-trees.h	Merge branch 'jc/fix-tree-walk'	2010-01-24 17:35:58 -08:00
upload-pack.c	run-command: support custom fd-set in async	2010-02-05 20:57:22 -08:00
usage.c	…
userdiff.c	git_attr(): fix function signature	2010-01-16 20:39:59 -08:00
userdiff.h	…
utf8.c	Merge branch 'rs/optim-text-wrap' into maint	2010-03-04 22:26:33 -08:00
utf8.h	Merge branch 'rs/optim-text-wrap' into maint	2010-03-04 22:26:33 -08:00
walker.c	…
walker.h	http: init and cleanup separately from http-walker	2010-03-02 11:10:36 -08:00
wrap-for-bin.sh	wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR	2010-03-02 16:27:03 -08:00
wrapper.c	Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.	2010-02-22 15:24:46 -08:00
write_or_die.c	…
ws.c	git_attr(): fix function signature	2010-01-16 20:39:59 -08:00
wt-status.c	Merge branch 'jl/submodule-diff-dirtiness'	2010-03-24 16:25:43 -07:00
wt-status.h	git status: Show detailed dirty status of submodules in long format	2010-03-08 15:49:23 -08:00
xdiff-interface.c	refactor duplicated fill_mm() in checkout and merge-recursive	2010-02-17 15:11:33 -08:00
xdiff-interface.h	refactor duplicated fill_mm() in checkout and merge-recursive	2010-02-17 15:11:33 -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.