kernel/git - git - PowerEL Git System

Go to file

Jonathan del Strother a19a424010 Revert "Convert output messages in merge-recursive to past tense." During a conflicting merge, you would typically see: Auto-merged foo.txt CONFLICT (content): Merge conflict in foo.txt Recorded preimage for 'foo.txt' Automatic merge failed; fix conflicts and then commit the result. and left wondering what happened to "foo.txt". Did it succeed, and then conflicted, and then what? This is because historically there was a progress bar displayed before the auto-merge is mentioned, and it was expected to take long time, before we can say "Auto-merged foo.txt". It turns out it was not the case, and the original wording "Auto-merging foo.txt" we used to have before `89f40be` (Convert output messages in merge-recursive to past tense., 2007-01-14) is better. Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2008-08-22 16:51:21 -07:00
Documentation	Teach "git diff -p" HTML funcname patterns	2008-08-20 23:56:31 -07:00
arm	…
compat	Merge branch 'maint'	2008-08-21 01:54:49 -07:00
contrib	completion: find out supported merge strategies correctly	2008-08-20 15:48:52 -07:00
git-gui	Merge git-gui 0.11.0	2008-08-17 11:41:19 -07:00
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	2008-08-16 23:21:07 -07:00
gitweb	gitweb: More about how gitweb gets 'owner' of repository	2008-07-27 14:14:01 -07:00
mozilla-sha1	…
perl	Git.pm: Make File::Spec and File::Temp requirement lazy	2008-08-16 02:58:22 -07:00
ppc	…
t	filter-branch: Grok special characters in tag names	2008-08-21 23:39:13 -07:00
templates	templates/Makefile: install is unnecessary, just use mkdir -p	2008-08-22 00:21:59 -07:00
xdiff	…
.gitattributes	…
.gitignore	Merge branch 'dr/ceiling'	2008-07-07 02:17:23 -07:00
.mailmap	.mailmap update	2008-07-19 11:25:51 -07:00
COPYING	…
GIT-VERSION-GEN	GIT 1.6.0	2008-08-17 11:42:10 -07:00
INSTALL	Fix typos in INSTALL	2008-08-04 21:52:08 -07:00
Makefile	Merge branch 'ph/enable-threaded'	2008-08-19 21:43:01 -07:00
README	…
RelNotes	Start 1.6.1 cycle	2008-08-17 16:20:31 -07:00
abspath.c	Allow add_path() to add non-existent directories to the path	2008-07-25 17:41:13 -07:00
alias.c	Move split_cmdline() to alias.c	2008-06-30 22:45:50 -07:00
alloc.c	…
archive-tar.c	archive: remove unused headers	2008-07-19 11:17:43 -07:00
archive-zip.c	archive: remove unused headers	2008-07-19 11:17:43 -07:00
archive.c	archive: allow --exec and --remote without equal sign	2008-07-30 00:15:14 -07:00
archive.h	archive: declare struct archiver where it's needed	2008-07-25 17:21:04 -07:00
attr.c	Fix buffer overflow in prepare_attr_stack	2008-07-16 14:05:50 -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	add: refuse to add working tree items beyond symlinks	2008-08-04 23:31:23 -07:00
builtin-annotate.c	…
builtin-apply.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
builtin-archive.c	archive: allow --exec and --remote without equal sign	2008-07-25 17:28:40 -07:00
builtin-blame.c	xdiff-interface: hide the whole "xdiff_emit_state" business from the caller	2008-08-14 00:30:26 -07:00
builtin-branch.c	builtin-branch: fix -v for --[no-]merged	2008-07-27 14:14:01 -07:00
builtin-bundle.c	…
builtin-cat-file.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-check-attr.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-check-ref-format.c	…
builtin-checkout-index.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-checkout.c	checkout --track: make up a sensible branch name if '-b' was omitted	2008-08-11 16:37:28 -07:00
builtin-clean.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-clone.c	clone --mirror: avoid storing repeated tags	2008-08-07 21:25:27 -07:00
builtin-commit-tree.c	Fix commit_tree() buffer leak	2008-08-17 16:27:17 -07:00
builtin-commit.c	Sync with 1.5.6.5	2008-08-06 13:50:48 -07:00
builtin-config.c	Make non-static functions, that may be static, static	2008-07-23 18:38:14 -07:00
builtin-count-objects.c	Merge branch 'mg/count-objects'	2008-08-20 23:41:54 -07:00
builtin-describe.c	Merge branch 'sb/dashless'	2008-07-16 17:22:50 -07:00
builtin-diff-files.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-diff-index.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-diff-tree.c	Teach git diff-tree --stdin to diff trees	2008-08-11 01:35:47 -07:00
builtin-diff.c	Allow pager of diff command be enabled/disabled	2008-07-23 11:14:47 -07:00
builtin-fast-export.c	Support copy and rename detection in fast-export.	2008-07-29 23:57:51 -07:00
builtin-fetch--tool.c	…
builtin-fetch-pack.c	git fetch-pack: do not complain about "no common commits" in an empty repo	2008-07-16 15:53:43 -07:00
builtin-fetch.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
builtin-fmt-merge-msg.c	Merge branch 'sb/dashless'	2008-07-16 17:22:50 -07:00
builtin-for-each-ref.c	for-each-ref: cope with tags with incomplete lines	2008-08-20 13:29:30 -07:00
builtin-fsck.c	Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long	2008-08-05 21:21:20 -07:00
builtin-gc.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-grep.c	Merge branch 'maint'	2008-07-20 17:16:29 -07:00
builtin-http-fetch.c	…
builtin-init-db.c	init: handle empty "template" parameter	2008-08-01 22:41:07 -07:00
builtin-log.c	Merge branch 'pm/log-exit-code'	2008-08-20 23:42:29 -07:00
builtin-ls-files.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-ls-remote.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-ls-tree.c	Add output flushing before fork()	2008-08-04 21:46:42 -07:00
builtin-mailinfo.c	mailinfo: avoid violating strbuf assertion	2008-08-19 19:36:56 -07:00
builtin-mailsplit.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
builtin-merge-base.c	merge-base: teach "git merge-base" to drive underlying merge_bases_many()	2008-07-29 23:17:35 -07:00
builtin-merge-file.c	…
builtin-merge-ours.c	…
builtin-merge-recursive.c	Revert "Convert output messages in merge-recursive to past tense."	2008-08-22 16:51:21 -07:00
builtin-merge.c	provide more errors for the "merge into empty head" case	2008-08-21 23:37:38 -07:00
builtin-mv.c	git-mv: Keep moved index entries inact	2008-07-27 15:05:19 -07:00
builtin-name-rev.c	Merge branch 'maint'	2008-08-03 14:14:10 -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	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-prune-packed.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-prune.c	Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long	2008-08-05 21:21:20 -07:00
builtin-push.c	Make push more verbose about illegal combination of options	2008-08-17 00:24:21 -07:00
builtin-read-tree.c	Move read_cache_unmerged() to read-cache.c	2008-06-30 22:45:51 -07:00
builtin-reflog.c	builtin-reflog: Allow reflog expire to name partial ref	2008-08-17 16:24:46 -07:00
builtin-remote.c	clone: Add an option to set up a mirror	2008-08-02 15:21:59 -07:00
builtin-rerere.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
builtin-reset.c	git-reset: Let -q hush "locally modified" messages	2008-07-25 17:57:22 -07:00
builtin-rev-list.c	Merge branch 'maint'	2008-07-19 11:28:06 -07:00
builtin-rev-parse.c	rev-parse: Add support for the ^! and ^@ syntax	2008-07-27 14:14:01 -07:00
builtin-revert.c	Merge branch 'maint'	2008-08-01 23:55:51 -07:00
builtin-rm.c	builtin-rm: Add a --force flag	2008-08-08 18:27:19 -07:00
builtin-send-pack.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-shortlog.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
builtin-show-branch.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-show-ref.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
builtin-stripspace.c	…
builtin-symbolic-ref.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-tag.c	Sync with 1.5.6.5	2008-08-06 13:50:48 -07:00
builtin-tar-tree.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-unpack-objects.c	Fix some warnings (on cygwin) to allow -Werror	2008-07-05 17:26:29 -07:00
builtin-update-index.c	update-index: refuse to add working tree items beyond symlinks	2008-08-04 23:31:23 -07:00
builtin-update-ref.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin-upload-archive.c	archive: define MAX_ARGS where it's needed	2008-07-25 17:20:55 -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	builtin-verify-tag: fix -v option parsing	2008-07-28 23:02:11 -07:00
builtin-write-tree.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
builtin.h	Allow pager of diff command be enabled/disabled	2008-07-23 11:14:47 -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	cache-tree.c: make cache_tree_find() static	2008-07-16 08:50:27 -07:00
cache-tree.h	cache-tree.c: make cache_tree_find() static	2008-07-16 08:50:27 -07:00
cache.h	Merge branch 'jc/index-extended-flags'	2008-08-20 23:41:47 -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	…
color.h	…
combine-diff.c	xdiff-interface: hide the whole "xdiff_emit_state" business from the caller	2008-08-14 00:30:26 -07:00
command-list.txt	…
commit.c	sort_in_topological_order(): avoid setting a commit flag	2008-08-01 23:14:22 -07:00
commit.h	merge-base: teach "git merge-base" to drive underlying merge_bases_many()	2008-07-29 23:17:35 -07:00
config.c	Make use of stat.ctime configurable	2008-07-28 23:26:25 -07:00
config.mak.in	config.mak.in: Pass on LDFLAGS from configure	2008-08-21 23:16:57 -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	…
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: SysV needs the signal handler reinstated.	2008-08-12 15:41:08 -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	decorate: allow const objects to be decorated	2008-08-20 13:30:49 -07:00
decorate.h	decorate: allow const objects to be decorated	2008-08-20 13:30:49 -07:00
delta.h	…
diff-delta.c	…
diff-lib.c	Fix buffer overflow in git diff	2008-07-16 14:03:24 -07:00
diff-no-index.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
diff.c	Teach "git diff -p" HTML funcname patterns	2008-08-20 23:56:31 -07:00
diff.h	Fix buffer overflow in git diff	2008-07-16 14:03:24 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir.c	Merge branch 'jc/add-stop-at-symlink'	2008-08-20 23:42:18 -07:00
dir.h	…
dump-cache-tree.c	…
editor.c	editor.c: Libify launch_editor()	2008-07-25 17:09:38 -07:00
entry.c	…
environment.c	Make use of stat.ctime configurable	2008-07-28 23:26:25 -07:00
exec_cmd.c	Refactor, adding prepare_git_cmd(const char **argv)	2008-07-28 23:02:11 -07:00
exec_cmd.h	Refactor, adding prepare_git_cmd(const char **argv)	2008-07-28 23:02:11 -07:00
fast-import.c	Support gitlinks in fast-import.	2008-07-19 11:25:51 -07:00
fetch-pack.h	…
fixup-builtins	make remove-dashes: apply to scripts and programs as well, not just to builtins	2008-07-11 21:13:17 -07:00
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	Make git-add -i accept ranges like 7-	2008-08-01 23:26:40 -07:00
git-am.sh	git-am: ignore --binary option	2008-08-16 02:32:36 -07:00
git-archimport.perl	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
git-bisect.sh	Merge branch 'maint'	2008-08-11 19:24:28 -07:00
git-compat-util.h	Merge branch 'rs/imap'	2008-08-19 21:42:46 -07:00
git-cvsexportcommit.perl	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
git-cvsimport.perl	Merge branch 'maint'	2008-08-05 21:21:08 -07:00
git-cvsserver.perl	cvsserver: Add cvs co -c support	2008-07-19 11:17:43 -07:00
git-filter-branch.sh	filter-branch: Grok special characters in tag names	2008-08-21 23:39:13 -07:00
git-instaweb.sh	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
git-lost-found.sh	…
git-merge-octopus.sh	git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge	2008-07-30 00:20:51 -07:00
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	Ignore dirty submodule states in "git pull --rebase"	2008-07-23 11:36:56 -07:00
git-quiltimport.sh	Rename .git/rebase to .git/rebase-apply	2008-07-21 18:51:47 -07:00
git-rebase--interactive.sh	rebase -i -p: fix parent rewriting	2008-08-13 15:17:10 -07:00
git-rebase.sh	Improve error output of git-rebase	2008-08-16 23:21:18 -07:00
git-relink.perl	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
git-repack.sh	Make usage strings dash-less	2008-07-13 14:12:48 -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	Merge branch 'maint'	2008-07-25 13:56:36 -07:00
git-sh-setup.sh	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
git-stash.sh	git-stash: improve synopsis in help and manual page	2008-08-16 02:58:18 -07:00
git-submodule.sh	git-submodule - Add 'foreach' subcommand	2008-08-17 16:29:22 -07:00
git-svn.perl	git-svn: fix dcommit to urls with embedded usernames	2008-08-20 23:48:07 -07:00
git-web--browse.sh	…
git.c	Record the command invocation path early	2008-07-25 17:41:13 -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	…
grep.c	…
grep.h	…
hash-object.c	add --no-filters option to git hash-object	2008-08-03 13:38:22 -07:00
hash.c	…
hash.h	…
help.c	Avoid chdir() in list_commands_in_dir()	2008-07-27 14:14:38 -07:00
http-push.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
http-walker.c	Merge branch 'maint'	2008-07-19 11:28:06 -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	Replace uses of "git-var" with "git var"	2008-07-30 11:42:01 -07:00
imap-send.c	imap-send.c: more style fixes	2008-07-25 21:51:30 -07:00
index-pack.c	Merge branch 'maint'	2008-07-25 13:56:36 -07:00
interpolate.c	…
interpolate.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	…
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	Teach git log --exit-code to return an appropriate exit code	2008-08-17 16:26:26 -07:00
log-tree.h	…
mailmap.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
mailmap.h	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
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	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
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	spawn pager via run_command interface	2008-07-25 21:29:44 -07:00
parse-options.c	Sync with 1.5.6.5	2008-08-06 13:50:48 -07:00
parse-options.h	Sync with 1.5.6.5	2008-08-06 13:50:48 -07:00
patch-delta.c	…
patch-id.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Fix typo in comments of longest_ancestor_length()	2008-08-11 16:44:54 -07:00
pkt-line.c	…
pkt-line.h	…
pretty.c	Rename path_list to string_list	2008-07-21 19:11:50 -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	index: future proof for "extended" index entries	2008-08-17 00:22:45 -07:00
receive-pack.c	Record the command invocation path early	2008-07-25 17:41:13 -07:00
reflog-walk.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
reflog-walk.h	…
refs.c	Merge branch 'maint'	2008-07-09 00:19:50 -07:00
refs.h	…
remote.c	remote.c: add a function for deleting a refspec array and use it (twice)	2008-08-22 00:15:37 -07:00
remote.h	remote.c: add a function for deleting a refspec array and use it (twice)	2008-08-22 00:15:37 -07:00
rerere.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
rerere.h	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
revision.c	Merge branch 'ag/rewrite_one' into maint	2008-08-07 11:40:12 -07:00
revision.h	revision.h: make show_early_output an extern which is defined in revision.c	2008-08-20 19:59:06 -07:00
run-command.c	Merge branch 'jk/pager-swap'	2008-08-19 21:42:55 -07:00
run-command.h	run-command: add pre-exec callback	2008-07-25 21:29:44 -07: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	Merge branch 'dp/hash-literally'	2008-08-19 21:43:25 -07:00
sha1_name.c	Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'	2008-08-21 23:30:17 -07:00
shallow.c	…
shell.c	Record the command invocation path early	2008-07-25 17:41:13 -07:00
shortlog.h	Rename path_list to string_list	2008-07-21 19:11:50 -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	Add some useful functions for strbuf manipulation.	2008-07-13 14:04:04 -07:00
strbuf.h	editor.c: Libify launch_editor()	2008-07-25 17:09:38 -07:00
string-list.c	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
string-list.h	Rename path_list to string_list	2008-07-21 19:11:50 -07:00
symlinks.c	…
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	test-parse-options: use appropriate cast in length_callback	2008-08-13 18:11:44 -07:00
test-path-utils.c	…
test-sha1.c	…
test-sha1.sh	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport.c	Merge branch 'maint'	2008-08-09 01:40:08 -07:00
transport.h	…
tree-diff.c	Fix buffer overflow in git diff	2008-07-16 14:03:24 -07:00
tree-walk.c	…
tree-walk.h	…
tree.c	add context pointer to read_tree_recursive()	2008-07-15 07:17:59 -07:00
tree.h	add context pointer to read_tree_recursive()	2008-07-15 07:17:59 -07:00
unpack-file.c	…
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	…
update-server-info.c	Make usage strings dash-less	2008-07-13 14:12:48 -07:00
upload-pack.c	Record the command invocation path early	2008-07-25 17:41:13 -07:00
usage.c	…
utf8.c	…
utf8.h	…
var.c	Replace uses of "git-var" with "git var"	2008-07-30 11:42:01 -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	…
wrapper.c	Move read_in_full() and write_in_full() to wrapper.c	2008-07-20 17:17:09 -07:00
write_or_die.c	Move read_in_full() and write_in_full() to wrapper.c	2008-07-20 17:17:09 -07: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: hide the whole "xdiff_emit_state" business from the caller	2008-08-14 00:30:26 -07:00
xdiff-interface.h	xdiff-interface: hide the whole "xdiff_emit_state" business from the caller	2008-08-14 00:30:26 -07: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/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.