kernel/git - git - PowerEL Git System

Go to file

Junio C Hamano fcab40a389 Merge branch 'mv/merge-in-c' * mv/merge-in-c: reduce_heads(): protect from duplicate input reduce_heads(): thinkofix Add a new test for git-merge-resolve t6021: add a new test for git-merge-resolve Teach merge.log to "git-merge" again Build in merge Fix t7601-merge-pull-config.sh on AIX git-commit-tree: make it usable from other builtins Add new test case to ensure git-merge prepends the custom merge message Add new test case to ensure git-merge reduces octopus parents when possible Introduce reduce_heads() Introduce get_merge_bases_many() Add new test to ensure git-merge handles more than 25 refs. Introduce get_octopus_merge_bases() in commit.c git-fmt-merge-msg: make it usable from other builtins Move read_cache_unmerged() to read-cache.c Add new test to ensure git-merge handles pull.twohead and pull.octopus Move parse-options's skip_prefix() to git-compat-util.h Move commit_list_count() to commit.c Move split_cmdline() to alias.c Conflicts: Makefile parse-options.c		2008-07-15 19:09:46 -07:00
Documentation	Merge branch 'js/maint-pretty-mailmap'	2008-07-15 18:59:04 -07:00
arm	…
compat	help (Windows): Display HTML in default browser using Windows' shell API	2008-07-13 14:41:28 -07:00
contrib	Merge branch 'mv/merge-in-c'	2008-07-15 19:09:46 -07:00
git-gui	Merge git://repo.or.cz/git-gui	2008-07-15 00:08:02 -07:00
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	2008-06-11 16:22:53 -07:00
gitweb	gitweb: Describe projects_index format in more detail	2008-07-07 16:35:00 -07:00
mozilla-sha1	…
perl	Git.pm: Add remote_refs() git-ls-remote frontend	2008-07-08 22:46:01 -07:00
ppc	…
t	Merge branch 'mv/merge-in-c'	2008-07-15 19:09:46 -07:00
templates	Merge branch 'j6t/mingw'	2008-07-02 21:57:52 -07:00
xdiff	…
.gitattributes	…
.gitignore	Merge branch 'dr/ceiling'	2008-07-07 02:17:23 -07:00
.mailmap	…
COPYING	…
GIT-VERSION-GEN	GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy	2008-06-28 10:53:11 -07:00
INSTALL	Tone down warning about GNU Interactive Tools	2008-07-08 23:05:26 -07:00
Makefile	Merge branch 'mv/merge-in-c'	2008-07-15 19:09:46 -07:00
README	…
RelNotes	Start preparing release notes for 1.5.6.3	2008-07-08 23:57:14 -07:00
abspath.c	shrink git-shell by avoiding redundant dependencies	2008-06-27 23:22:00 -07:00
alias.c	Move split_cmdline() to alias.c	2008-06-30 22:45:50 -07:00
alloc.c	…
archive-tar.c	Teach new attribute 'export-ignore' to git-archive	2008-06-09 14:53:46 -07:00
archive-zip.c	Teach new attribute 'export-ignore' to git-archive	2008-06-09 14:53:46 -07:00
archive.c	Teach new attribute 'export-ignore' to git-archive	2008-06-09 14:53:46 -07:00
archive.h	Teach new attribute 'export-ignore' to git-archive	2008-06-09 14:53:46 -07:00
attr.c	Ignore .gitattributes in bare repositories	2008-06-09 15:08:26 -07:00
attr.h	…
base85.c	…
blob.c	…
blob.h	…
branch.c	Move MERGE_RR from .git/rr-cache/ into .git/	2008-07-13 01:03:10 -07:00
branch.h	…
builtin-add.c	git add: add long equivalents of '-u' and '-f' options	2008-06-14 12:47:31 -07:00
builtin-annotate.c	…
builtin-apply.c	apply: fix copy/rename breakage	2008-07-09 20:31:44 -07:00
builtin-archive.c	…
builtin-blame.c	revisions: refactor handle_revision_opt into parse_revision_opt.	2008-07-09 15:14:11 -07:00
builtin-branch.c	Merge branch 'jc/branch-merged'	2008-07-14 23:47:01 -07:00
builtin-bundle.c	…
builtin-cat-file.c	git cat-file: Fix memory leak in batch mode	2008-06-28 19:50:56 -07:00
builtin-check-attr.c	…
builtin-check-ref-format.c	…
builtin-checkout-index.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-checkout.c	Refactor "tracking statistics" code used by "git checkout"	2008-07-02 23:32:25 -07:00
builtin-clean.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-clone.c	Merge branch 'maint'	2008-07-09 00:19:50 -07:00
builtin-commit-tree.c	git-commit-tree: make it usable from other builtins	2008-07-06 19:23:00 -07:00
builtin-commit.c	rerere: Separate libgit and builtin functions	2008-07-10 00:26:29 -07:00
builtin-config.c	Only use GIT_CONFIG in "git config", not other programs	2008-07-01 02:35:49 -07:00
builtin-count-objects.c	…
builtin-describe.c	Fix describe --tags --long so it does not segfault	2008-07-02 21:21:59 -07:00
builtin-diff-files.c	Merge branch 'jc/diff-no-no-index'	2008-05-26 22:38:19 -07:00
builtin-diff-index.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-diff-tree.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-diff.c	Merge branch 'jc/diff-no-no-index'	2008-05-26 22:38:19 -07:00
builtin-fast-export.c	Fix some warnings (on cygwin) to allow -Werror	2008-07-05 17:26:29 -07:00
builtin-fetch--tool.c	…
builtin-fetch-pack.c	Fix some warnings (on cygwin) to allow -Werror	2008-07-05 17:26:29 -07:00
builtin-fetch.c	fetch: give a hint to the user when local refs fail to update	2008-06-29 23:47:41 -07:00
builtin-fmt-merge-msg.c	git-fmt-merge-msg: make it usable from other builtins	2008-06-30 22:45:51 -07:00
builtin-for-each-ref.c	for-each-ref: implement missing tag values	2008-06-25 11:05:26 -07:00
builtin-fsck.c	move show_pack_info() where it belongs	2008-06-24 23:58:57 -07:00
builtin-gc.c	Merge branch 'js/config-cb'	2008-05-25 14:25:02 -07:00
builtin-grep.c	…
builtin-http-fetch.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-init-db.c	Move code interpreting path relative to exec-dir to new function system_path()	2008-07-13 14:41:28 -07:00
builtin-log.c	builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'	2008-07-05 17:42:24 -07:00
builtin-ls-files.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-ls-remote.c	…
builtin-ls-tree.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-mailinfo.c	git-mailinfo: Fix getting the subject from the in-body [PATCH] line	2008-07-13 17:21:15 -07:00
builtin-mailsplit.c	git-am/git-mailsplit: correct synopsis for reading from stdin	2008-07-13 16:08:27 -07:00
builtin-merge-base.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-merge-file.c	…
builtin-merge-ours.c	…
builtin-merge-recursive.c	Move commit_list_count() to commit.c	2008-06-30 22:45:50 -07:00
builtin-merge.c	Merge branch 'mv/merge-in-c'	2008-07-15 19:09:46 -07:00
builtin-mv.c	Merge branch 'js/config-cb'	2008-05-25 14:25:02 -07:00
builtin-name-rev.c	Merge branch 'maint'	2008-06-06 09:21:48 -07:00
builtin-pack-objects.c	Fix some warnings (on cygwin) to allow -Werror	2008-07-05 17:26:29 -07:00
builtin-pack-refs.c	Move pack_refs() and friends into libgit	2008-06-19 15:53:13 -07:00
builtin-prune-packed.c	Remove now unnecessary 'sync()' calls	2008-05-31 14:49:29 -07:00
builtin-prune.c	Remove now unnecessary 'sync()' calls	2008-05-31 14:49:29 -07:00
builtin-push.c	…
builtin-read-tree.c	Move read_cache_unmerged() to read-cache.c	2008-06-30 22:45:51 -07:00
builtin-reflog.c	Make default expiration period of reflog used for stash infinite	2008-06-28 22:24:49 -07:00
builtin-remote.c	Move parse-options's skip_prefix() to git-compat-util.h	2008-06-30 22:45:50 -07:00
builtin-rerere.c	Move MERGE_RR from .git/rr-cache/ into .git/	2008-07-13 01:03:10 -07:00
builtin-reset.c	Allow "git-reset path" when unambiguous	2008-06-25 18:16:36 -07:00
builtin-rev-list.c	Merge branch 'ph/parseopt-step-blame'	2008-07-13 15:16:35 -07:00
builtin-rev-parse.c	Merge branch 'js/config-cb'	2008-05-25 14:25:02 -07:00
builtin-revert.c	Allow cherry-picking root commits	2008-07-07 13:23:42 -07:00
builtin-rm.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-send-pack.c	make deleting a missing ref more quiet	2008-07-08 13:05:11 -07:00
builtin-shortlog.c	shortlog: support --pretty=format: option	2008-07-15 07:37:00 -07:00
builtin-show-branch.c	Merge branch 'maint'	2008-05-26 19:49:01 -07:00
builtin-show-ref.c	…
builtin-stripspace.c	…
builtin-symbolic-ref.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-tag.c	Convert CR/LF to LF in tag signatures	2008-07-11 21:14:34 -07:00
builtin-tar-tree.c	…
builtin-unpack-objects.c	Fix some warnings (on cygwin) to allow -Werror	2008-07-05 17:26:29 -07:00
builtin-update-index.c	Merge branch 'js/config-cb'	2008-05-25 14:25:02 -07:00
builtin-update-ref.c	Make old sha1 optional with git update-ref -d	2008-06-02 22:52:39 -07:00
builtin-upload-archive.c	avoid off-by-one error in run_upload_archive	2008-06-28 13:43:21 -07:00
builtin-verify-pack.c	Fix some warnings (on cygwin) to allow -Werror	2008-07-05 17:26:29 -07:00
builtin-verify-tag.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin-write-tree.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
builtin.h	Build in merge	2008-07-07 17:50:01 -07:00
bundle.c	Teach git-bundle to read revision arguments from stdin like git-rev-list.	2008-07-07 01:31:24 -07:00
bundle.h	…
cache-tree.c	Merge branch 'maint-1.5.4' into maint	2008-04-24 21:50:48 -07:00
cache-tree.h	…
cache.h	Merge branch 'mv/merge-in-c'	2008-07-15 19:09:46 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	Move all dashed-form commands to libexecdir	2008-06-19 16:00:38 -07:00
color.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
color.h	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
combine-diff.c	Merge branch 'jc/maint-combine-diff-pre-context' into maint	2008-06-25 11:20:01 -07:00
command-list.txt	…
commit.c	reduce_heads(): protect from duplicate input	2008-07-14 00:09:41 -07:00
commit.h	Merge branch 'mv/merge-in-c'	2008-07-15 19:09:46 -07:00
config.c	Move code interpreting path relative to exec-dir to new function system_path()	2008-07-13 14:41:28 -07:00
config.mak.in	Move all dashed-form commands to libexecdir	2008-06-19 16:00:38 -07:00
configure.ac	Consistency: Use "libcurl" instead of "cURL library" and "curl"	2008-06-15 13:35:10 -07:00
connect.c	Windows: Disambiguate DOS style paths from SSH URLs.	2008-06-26 08:45:08 +02:00
convert.c	Fixed text file auto-detection: treat EOF character 032 at the end of file as printable	2008-07-11 21:14:27 -07:00
copy.c	copy.c: copy_fd - correctly report write errors	2008-04-22 21:21:08 -07:00
csum-file.c	Make pack creation always fsync() the result	2008-05-31 14:46:57 -07:00
csum-file.h	Make pack creation always fsync() the result	2008-05-31 14:46:57 -07:00
ctype.c	…
daemon.c	git daemon: avoid calling syslog() from a signal handler	2008-07-06 19:10:31 -07:00
date.c	Make my_mktime() public and rename it to tm_to_time_t()	2008-06-23 13:40:29 +02:00
decorate.c	fast-export --export-marks: fix off by one error	2008-07-03 00:34:59 -07:00
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	"git diff": do not ignore index without --no-index	2008-05-24 00:16:39 -07:00
diff-no-index.c	git diff --no-index: default to page like other diff frontends	2008-05-26 22:35:07 -07:00
diff.c	Merge branch 'qq/maint'	2008-07-05 18:33:16 -07:00
diff.h	Merge branch 'jc/diff-no-no-index'	2008-05-26 22:38:19 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	diff: make "too many files" rename warning optional	2008-05-03 13:40:43 -07:00
diffcore.h	…
dir.c	Merge branch 'lt/case-insensitive'	2008-05-10 18:14:28 -07:00
dir.h	…
dump-cache-tree.c	…
entry.c	…
environment.c	shrink git-shell by avoiding redundant dependencies	2008-06-27 23:22:00 -07:00
exec_cmd.c	Move code interpreting path relative to exec-dir to new function system_path()	2008-07-13 14:41:28 -07:00
exec_cmd.h	Move code interpreting path relative to exec-dir to new function system_path()	2008-07-13 14:41:28 -07:00
fast-import.c	Make pack creation always fsync() the result	2008-05-31 14:46:57 -07:00
fetch-pack.h	…
fixup-builtins	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	Merge branch 'sp/win'	2008-07-15 18:59:45 -07:00
git-am.sh	Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"	2008-07-15 18:49:28 -07:00
git-archimport.perl	…
git-bisect.sh	bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting	2008-05-28 11:47:58 -07:00
git-compat-util.h	Merge branch 'mv/merge-in-c'	2008-07-15 19:09:46 -07:00
git-cvsexportcommit.perl	Merge branch 'js/cvsexportcommit'	2008-05-25 13:37:20 -07:00
git-cvsimport.perl	git-cvsimport: do not fail when CVSROOT is /	2008-06-10 22:24:01 -07:00
git-cvsserver.perl	git-cvsserver: add ability to guess -kb from contents	2008-05-16 12:05:35 -07:00
git-filter-branch.sh	Merge 1.5.5.3 in	2008-05-27 22:34:19 -07:00
git-instaweb.sh	git-instaweb: improve auto-discovery of httpd and call conventions.	2008-06-13 22:08:30 -07:00
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool.sh	Remove the use of '--' in merge program invocation	2008-06-19 14:13:55 -07:00
git-parse-remote.sh	…
git-pull.sh	pull --rebase: exit early when the working directory is dirty	2008-05-22 23:05:11 -07:00
git-quiltimport.sh	Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"	2008-07-15 18:49:28 -07:00
git-rebase--interactive.sh	Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"	2008-07-15 18:49:28 -07:00
git-rebase.sh	Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"	2008-07-15 18:49:28 -07:00
git-relink.perl	…
git-repack.sh	repack.usedeltabaseoffset config option now defaults to "true"	2008-06-25 10:56:40 -07:00
git-request-pull.sh	git-request-pull: replace call to deprecated peek-remote	2008-07-13 16:08:27 -07:00
git-send-email.perl	git-send-email: Fix authenticating on some servers when using TLS.	2008-07-09 15:53:10 -07:00
git-sh-setup.sh	Windows: Work around incompatible sort and find.	2008-06-26 08:45:09 +02:00
git-stash.sh	Merge branch 'am/stash-branch'	2008-07-13 15:16:09 -07:00
git-submodule.sh	git-submodule - register submodule URL if adding in place	2008-07-14 23:35:32 -07:00
git-svn.perl	git-svn: typofix	2008-07-14 23:35:31 -07:00
git-web--browse.sh	…
git.c	Merge branch 'mv/merge-in-c'	2008-07-15 19:09:46 -07:00
git.spec.in	Move all dashed-form commands to libexecdir	2008-06-19 16:00:38 -07:00
graph.c	git log --graph: print '*' for all commits, including merges	2008-06-06 11:56:43 -07:00
graph.h	log --graph --left-right: show left/right information in place of '*'	2008-05-25 12:06:52 -07:00
grep.c	…
grep.h	…
hash-object.c	Merge branch 'js/config-cb'	2008-05-25 14:25:02 -07:00
hash.c	…
hash.h	…
help.c	help (Windows): Display HTML in default browser using Windows' shell API	2008-07-13 14:41:28 -07:00
http-push.c	move show_pack_info() where it belongs	2008-06-24 23:58:57 -07:00
http-walker.c	move show_pack_info() where it belongs	2008-06-24 23:58:57 -07:00
http.c	http.c: Use 'git_config_string' to clean up SSL config.	2008-07-05 17:42:46 -07:00
http.h	Work around gcc warnings from curl headers	2008-07-04 00:37:40 -07:00
ident.c	commit: Show committer if automatic	2008-05-06 16:50:17 -07:00
imap-send.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
index-pack.c	Fix some warnings (on cygwin) to allow -Werror	2008-07-05 17:26:29 -07:00
interpolate.c	…
interpolate.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
ll-merge.h	…
lockfile.c	rollback lock files on more signals than just SIGINT	2008-05-31 14:33:59 -07:00
log-tree.c	log --graph --left-right: show left/right information in place of '*'	2008-05-25 12:06:52 -07:00
log-tree.h	Remove dead code: show_log() sep argument and diff_options.msg_sep	2008-05-03 11:48:03 -07:00
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-index.c	…
merge-recursive.h	…
merge-tree.c	…
mktag.c	…
mktree.c	…
name-hash.c	…
object.c	…
object.h	…
pack-check.c	verify-pack: check packed object CRC when using index version 2	2008-06-24 23:58:57 -07:00
pack-redundant.c	…
pack-refs.c	Move pack_refs() and friends into libgit	2008-06-19 15:53:13 -07:00
pack-refs.h	Move pack_refs() and friends into libgit	2008-06-19 15:53:13 -07:00
pack-revindex.c	call init_pack_revindex() lazily	2008-06-23 21:25:20 -07:00
pack-revindex.h	call init_pack_revindex() lazily	2008-06-23 21:25:20 -07:00
pack-write.c	pack.indexversion config option now defaults to 2	2008-06-25 21:30:55 -07:00
pack.h	verify-pack: check packed object CRC when using index version 2	2008-06-24 23:58:57 -07:00
pager.c	Windows: Make the pager work.	2008-06-26 08:47:15 +02:00
parse-options.c	Merge branch 'mv/merge-in-c'	2008-07-15 19:09:46 -07:00
parse-options.h	parse-options: add PARSE_OPT_LASTARG_DEFAULT flag	2008-07-09 01:33:24 -07:00
patch-delta.c	…
patch-id.c	…
patch-ids.c	…
patch-ids.h	…
path-list.c	…
path-list.h	…
path.c	Merge branch 'maint' to sync with 1.5.6.3	2008-07-13 15:45:38 -07:00
pkt-line.c	Cleanup xread() loops to use read_in_full()	2008-05-03 22:15:25 -07:00
pkt-line.h	…
pretty.c	Add pretty format %aN which gives the author name, respecting .mailmap	2008-07-11 21:16:37 -07:00
progress.c	progress.c: avoid use of dynamic-sized array	2008-06-08 13:56:32 -07:00
progress.h	…
quote.c	shrink git-shell by avoiding redundant dependencies	2008-06-27 23:22:00 -07:00
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'lt/racy-empty' into maint	2008-07-08 00:19:17 -07:00
receive-pack.c	Fix some warnings (on cygwin) to allow -Werror	2008-07-05 17:26:29 -07:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'maint'	2008-07-09 00:19:50 -07:00
refs.h	Allow for having for_each_ref() list extra refs	2008-05-04 17:41:44 -07:00
remote.c	stat_tracking_info(): clear object flags used during counting	2008-07-03 12:14:53 -07:00
remote.h	Refactor "tracking statistics" code used by "git checkout"	2008-07-02 23:32:25 -07:00
rerere.c	Merge branch 'js/merge-rr'	2008-07-14 23:56:27 -07:00
rerere.h	rerere: Separate libgit and builtin functions	2008-07-10 00:26:29 -07:00
revision.c	Merge branch 'ag/rewrite_one'	2008-07-15 18:59:48 -07:00
revision.h	Merge branch 'ph/parseopt-step-blame'	2008-07-13 15:16:35 -07:00
run-command.c	Merge branch 'qq/maint'	2008-07-07 16:42:08 -07:00
run-command.h	Windows: Implement asynchronous functions as threads.	2008-06-26 08:45:08 +02:00
send-pack.h	…
server-info.c	…
setup.c	Merge branch 'dr/ceiling'	2008-07-07 02:17:23 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	restore legacy behavior for read_sha1_file()	2008-07-14 23:35:32 -07:00
sha1_name.c	Merge branch 'maint-1.5.4' into maint	2008-04-29 22:55:07 -07:00
shallow.c	…
shell.c	shrink git-shell by avoiding redundant dependencies	2008-06-27 23:22:00 -07:00
shortlog.h	shortlog: support --pretty=format: option	2008-07-15 07:37:00 -07:00
show-index.c	Fix some warnings (on cygwin) to allow -Werror	2008-07-05 17:26:29 -07:00
sideband.c	…
sideband.h	…
strbuf.c	…
strbuf.h	…
symlinks.c	Optimize symlink/directory detection	2008-05-10 18:16:31 -07:00
tag.c	…
tag.h	…
tar.h	…
test-chmtime.c	…
test-date.c	…
test-delta.c	…
test-genrandom.c	…
test-match-trees.c	…
test-parse-options.c	Extend parse-options test suite	2008-06-22 18:15:18 -07:00
test-path-utils.c	Add support for GIT_CEILING_DIRECTORIES	2008-05-23 14:15:01 -07:00
test-sha1.c	…
test-sha1.sh	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport.c	Merge branch 'qq/maint'	2008-07-05 18:33:16 -07:00
transport.h	Mark the list of refs to fetch as const	2008-05-04 17:41:44 -07:00
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unpack-file.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
unpack-trees.c	unpack_trees(): allow callers to differentiate worktree errors from merge errors	2008-05-29 17:35:21 -07:00
unpack-trees.h	unpack-trees: allow Porcelain to give different error messages	2008-05-19 19:30:13 -07:00
update-server-info.c	…
upload-pack.c	Windows: Implement asynchronous functions as threads.	2008-06-26 08:45:08 +02:00
usage.c	…
utf8.c	…
utf8.h	…
var.c	Provide git_config with a callback-data parameter	2008-05-14 12:34:44 -07:00
walker.c	Fix "git clone http://$URL " to check out the worktree when asked	2008-06-04 13:33:25 -07:00
walker.h	Make walker.fetch_ref() take a struct ref.	2008-04-26 17:36:17 -07:00
wrapper.c	Shrink the git binary a bit by avoiding unnecessary inline functions	2008-06-22 18:46:00 -07:00
write_or_die.c	Windows: Work around an oddity when a pipe with no reader is written to.	2008-06-26 08:47:15 +02:00
ws.c	Teach "diff --check" about new blank lines at end	2008-06-26 22:07:26 -07:00
wt-status.c	Merge branch 'jc/report-tracking'	2008-07-13 15:15:23 -07:00
wt-status.h	Add argument 'no' commit/status option -u\|--untracked-files	2008-06-09 15:48:19 -07:00
xdiff-interface.c	…
xdiff-interface.h	…

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/tutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands,
and "man git-commandname" for documentation of each command.
CVS users may also want to read Documentation/cvs-migration.txt.

Many Git online resources are accessible from http://git.or.cz/
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.