kernel/git - git - PowerEL Git System

Go to file

Junio C Hamano bd15ef078a Merge branch 'da/difftool' * da/difftool: mergetool--lib: simplify API usage by removing more global variables Fix misspelled mergetool.keepBackup difftool/mergetool: refactor commands to use git-mergetool--lib mergetool: use $( ... ) instead of `backticks` bash completion: add git-difftool difftool: add support for a difftool.prompt config variable difftool: add various git-difftool tests difftool: move 'git-difftool' out of contrib difftool/mergetool: add diffuse as merge and diff tool difftool: add a -y shortcut for --no-prompt difftool: use perl built-ins when testing for msys difftool: remove the backup file feature difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff git-mergetool: add new merge tool TortoiseMerge git-mergetool/difftool: make (g)vimdiff workable under Windows doc/merge-config: list ecmerge as a built-in merge tool		2009-04-17 21:42:12 -07:00
Documentation	Merge branch 'da/difftool'	2009-04-17 21:42:12 -07:00
arm	…
compat	MinGW: Quote arguments for subprocesses that contain a single-quote	2009-03-24 14:42:59 -07:00
contrib	Merge branch 'da/difftool'	2009-04-17 21:42:12 -07:00
git-gui	…
gitk-git	…
gitweb	…
mozilla-sha1	…
perl	add --html-path to get the location of installed HTML docs	2009-04-04 23:57:59 -07:00
ppc	…
t	Merge branch 'da/difftool'	2009-04-17 21:42:12 -07:00
templates	hook/update: example of how to prevent branch creation	2009-04-17 21:26:11 -07:00
xdiff	…
.gitattributes	…
.gitignore	Merge branch 'da/difftool'	2009-04-17 21:42:12 -07:00
.mailmap	…
COPYING	…
GIT-VERSION-GEN	GIT 1.6.2.3	2009-04-12 15:57:58 -07:00
INSTALL	…
Makefile	Merge branch 'da/difftool'	2009-04-17 21:42:12 -07:00
README	…
RelNotes	Start 1.6.2.3 preparation	2009-04-08 23:40:33 -07:00
abspath.c	…
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
attr.c	…
attr.h	…
base85.c	…
bisect.c	rev-list: add "int bisect_show_flags" in "struct rev_list_info"	2009-04-07 22:12:44 -07:00
bisect.h	rev-list: add "int bisect_show_flags" in "struct rev_list_info"	2009-04-07 22:12:44 -07:00
blob.c	…
blob.h	…
branch.c	strbuf_check_branch_ref(): a helper to check a refname for a branch	2009-03-22 23:52:11 -07:00
branch.h	…
builtin-add.c	Merge branch 'mv/parseopt-ls-files'	2009-03-20 14:30:51 -07:00
builtin-annotate.c	…
builtin-apply.c	git-apply: fix option description	2009-04-16 16:32:17 -07:00
builtin-archive.c	…
builtin-bisect--helper.c	bisect--helper: implement "git bisect--helper"	2009-04-05 01:29:44 -07:00
builtin-blame.c	Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1	2009-04-08 23:02:17 -07:00
builtin-branch.c	branch: show upstream branch when double verbose	2009-04-07 23:22:15 -07:00
builtin-bundle.c	…
builtin-cat-file.c	…
builtin-check-attr.c	…
builtin-check-ref-format.c	strbuf_check_branch_ref(): a helper to check a refname for a branch	2009-03-22 23:52:11 -07:00
builtin-checkout-index.c	…
builtin-checkout.c	Merge branch 'maint'	2009-04-07 23:05:43 -07:00
builtin-clean.c	…
builtin-clone.c	builtin-clone.c: no need to strdup for setenv	2009-04-01 08:58:55 -07:00
builtin-commit-tree.c	…
builtin-commit.c	Merge branch 'maint-1.6.1' into maint	2009-04-05 01:04:54 -07:00
builtin-config.c	…
builtin-count-objects.c	Merge branch 'jc/maint-1.6.0-keep-pack' into maint	2009-04-08 23:21:10 -07:00
builtin-describe.c	…
builtin-diff-files.c	…
builtin-diff-index.c	…
builtin-diff-tree.c	…
builtin-diff.c	…
builtin-fast-export.c	Merge branch 'ef/fast-export'	2009-04-01 22:49:28 -07:00
builtin-fetch--tool.c	…
builtin-fetch-pack.c	builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")	2009-03-23 21:02:26 -07:00
builtin-fetch.c	Merge branch 'db/push-cleanup'	2009-03-26 00:28:46 -07:00
builtin-fmt-merge-msg.c	…
builtin-for-each-ref.c	make get_short_ref a public function	2009-04-07 23:22:15 -07:00
builtin-fsck.c	Merge branch 'jc/maint-1.6.0-keep-pack' into maint	2009-04-08 23:21:10 -07:00
builtin-gc.c	…
builtin-grep.c	…
builtin-help.c	…
builtin-http-fetch.c	…
builtin-init-db.c	Merge branch 'jc/shared-literally'	2009-04-06 00:42:52 -07:00
builtin-log.c	Merge branch 'sb/format-patch-patchname'	2009-04-06 00:42:23 -07:00
builtin-ls-files.c	ls-files: require worktree when --deleted is given	2009-03-21 23:19:27 -07:00
builtin-ls-remote.c	…
builtin-ls-tree.c	Produce a nicer output in case of sha1_object_info failures in ls-tree -l	2009-03-20 09:35:21 -07:00
builtin-mailinfo.c	…
builtin-mailsplit.c	…
builtin-merge-base.c	…
builtin-merge-file.c	…
builtin-merge-ours.c	…
builtin-merge-recursive.c	…
builtin-merge.c	strbuf_branchname(): a wrapper for branch name shorthands	2009-03-22 23:44:08 -07:00
builtin-mv.c	…
builtin-name-rev.c	…
builtin-pack-objects.c	Merge branch 'cc/bisect-filter'	2009-04-12 16:46:40 -07:00
builtin-pack-refs.c	…
builtin-prune-packed.c	…
builtin-prune.c	…
builtin-push.c	Merge branch 'fg/push-default'	2009-03-26 00:26:25 -07:00
builtin-read-tree.c	…
builtin-receive-pack.c	…
builtin-reflog.c	Speed up reflog pruning of unreachable commits	2009-04-01 12:35:12 -07:00
builtin-remote.c	git remote update: Fallback to remote if group does not exist	2009-04-07 21:52:26 -07:00
builtin-rerere.c	…
builtin-reset.c	…
builtin-rev-list.c	rev-list: add "int bisect_show_flags" in "struct rev_list_info"	2009-04-07 22:12:44 -07:00
builtin-rev-parse.c	…
builtin-revert.c	…
builtin-rm.c	builtin-rm: use warning() instead of fprintf(stderr, "warning: ")	2009-03-23 21:02:27 -07:00
builtin-send-pack.c	builtin-send-pack.c: avoid empty structure initialization	2009-03-26 21:01:34 -07:00
builtin-shortlog.c	…
builtin-show-branch.c	builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ")	2009-03-23 21:02:27 -07:00
builtin-show-ref.c	builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")	2009-03-23 21:02:27 -07:00
builtin-stripspace.c	…
builtin-symbolic-ref.c	…
builtin-tag.c	…
builtin-tar-tree.c	…
builtin-unpack-objects.c	…
builtin-update-index.c	…
builtin-update-ref.c	…
builtin-upload-archive.c	…
builtin-verify-pack.c	…
builtin-verify-tag.c	…
builtin-write-tree.c	…
builtin.h	bisect--helper: implement "git bisect--helper"	2009-04-05 01:29:44 -07:00
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'jc/shared-literally' into maint	2009-04-08 23:23:41 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
combine-diff.c	…
command-list.txt	difftool: move 'git-difftool' out of contrib	2009-04-07 22:19:56 -07:00
commit.c	…
commit.h	…
config.c	Merge branch 'maint'	2009-04-17 21:29:15 -07:00
config.mak.in	…
configure.ac	…
connect.c	…
convert.c	…
copy.c	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	Merge branch 'maint'	2009-03-28 01:16:46 -07:00
diff.c	Allow users to un-configure rename detection	2009-04-11 22:22:00 -07:00
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	pickaxe: count regex matches only once	2009-03-21 23:18:53 -07:00
diffcore-rename.c	…
diffcore.h	…
dir.c	Merge branch 'mv/parseopt-ls-files'	2009-03-20 14:30:51 -07:00
dir.h	…
editor.c	…
entry.c	…
environment.c	…
exec_cmd.c	Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1	2009-04-08 23:01:10 -07:00
exec_cmd.h	…
fast-import.c	Merge branch 'jc/shared-literally'	2009-04-06 00:42:52 -07:00
fetch-pack.h	…
fixup-builtins	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	…
git-am.sh	…
git-archimport.perl	…
git-bisect.sh	Merge branch 'cc/bisect-filter'	2009-04-12 16:46:40 -07:00
git-compat-util.h	Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1	2009-03-21 22:53:36 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	mergetool--lib: simplify API usage by removing more global variables	2009-04-12 15:19:12 -07:00
git-difftool.perl	difftool: add support for a difftool.prompt config variable	2009-04-07 22:19:56 -07:00
git-filter-branch.sh	git-filter-branch: avoid collisions with variables in eval'ed commands	2009-03-25 16:35:52 -07:00
git-instaweb.sh	…
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	mergetool--lib: simplify API usage by removing more global variables	2009-04-12 15:19:12 -07:00
git-mergetool.sh	mergetool--lib: simplify API usage by removing more global variables	2009-04-12 15:19:12 -07:00
git-parse-remote.sh	…
git-pull.sh	Merge branch 'maint'	2009-04-08 23:47:23 -07:00
git-quiltimport.sh	…
git-rebase--interactive.sh	…
git-rebase.sh	rebase: fix typo (force_rebas -> force-rebas)	2009-03-27 14:26:34 -07:00
git-relink.perl	…
git-repack.sh	Merge branch 'jc/maint-1.6.0-keep-pack' into maint	2009-04-08 23:21:10 -07:00
git-request-pull.sh	…
git-send-email.perl	send-email: fix nasty bug in ask() function	2009-04-04 22:53:32 -07:00
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	git submodule: fix usage line	2009-04-05 01:16:31 -07:00
git-svn.perl	git-svn: always initialize with core.autocrlf=false	2009-04-11 22:21:59 -07:00
git-web--browse.sh	…
git.c	Merge branch 'cc/bisect-filter'	2009-04-12 16:46:40 -07:00
git.spec.in	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash-object.c	…
hash.c	…
hash.h	…
help.c	…
help.h	…
http-push.c	Replace ",<,>,& with their respective XML entities in DAV requests	2009-04-11 22:21:59 -07:00
http-walker.c	Move chmod(foo, 0444) into move_temp_to_file()	2009-03-27 22:10:58 -07:00
http.c	Allow curl to rewind the read buffers	2009-04-02 13:04:07 -07:00
http.h	Allow curl to rewind the read buffers	2009-04-02 13:04:07 -07:00
ident.c	…
imap-send.c	…
index-pack.c	Merge branch 'jc/shared-literally'	2009-04-06 00:42:52 -07:00
levenshtein.c	…
levenshtein.h	…
list-objects.c	Merge branch 'cc/bisect-filter'	2009-04-12 16:46:40 -07:00
list-objects.h	list-objects: add "void *data" parameter to show functions	2009-04-07 22:12:38 -07:00
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
log-tree.c	log-tree: fix patch filename computation in "git format-patch"	2009-03-27 01:10:27 -07:00
log-tree.h	format-patch: --attach/inline uses filename instead of SHA1	2009-03-22 21:45:19 -07:00
mailmap.c	Merge branch 'maint'	2009-04-01 22:46:31 -07:00
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-index.c	…
merge-recursive.c	Merge branch 'cb/maint-merge-recursive-submodule-fix'	2009-04-07 22:32:56 -07:00
merge-recursive.h	…
merge-tree.c	…
mktag.c	…
mktree.c	…
name-hash.c	…
object.c	…
object.h	…
pack-check.c	…
pack-redundant.c	…
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1	2009-03-21 22:53:36 -07:00
pack.h	…
pager.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-id.c	…
patch-ids.c	patch-ids: use the new generic "sha1_pos" function to lookup sha1	2009-04-04 22:57:42 -07:00
patch-ids.h	…
path.c	set_shared_perm(): sometimes we know what the final mode bits should look like	2009-03-28 08:02:15 -07:00
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	format_sanitized_subject: Don't trim past initial length of strbuf	2009-04-01 11:05:31 -07:00
progress.c	…
progress.h	…
quote.c	quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array	2009-03-30 01:22:53 -07:00
quote.h	quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array	2009-03-30 01:22:53 -07:00
reachable.c	process_{tree,blob}: Remove useless xstrdup calls	2009-04-08 22:58:43 -07:00
reachable.h	…
read-cache.c	…
reflog-walk.c	make oneline reflog dates more consistent with multiline format	2009-03-20 00:57:27 -07:00
reflog-walk.h	make oneline reflog dates more consistent with multiline format	2009-03-20 00:57:27 -07:00
refs.c	Merge branch 'jk/show-upstream'	2009-04-12 16:46:42 -07:00
refs.h	Merge branch 'jk/show-upstream'	2009-04-12 16:46:42 -07:00
remote.c	get_local_heads(): do not return random pointer if there is no head	2009-04-17 20:48:32 -07:00
remote.h	remote: New function remote_is_configured()	2009-04-07 21:51:59 -07:00
rerere.c	…
rerere.h	…
revision.c	Merge branch 'jc/maint-1.6.0-keep-pack' into maint	2009-04-08 23:21:10 -07:00
revision.h	Merge branch 'jc/maint-1.6.0-keep-pack' into maint	2009-04-08 23:21:10 -07:00
run-command.c	…
run-command.h	fix portability problem with IS_RUN_COMMAND_ERR	2009-04-01 11:05:54 -07:00
send-pack.h	…
server-info.c	…
setup.c	"core.sharedrepository = 0mode" should set, not loosen	2009-03-27 21:51:04 -07:00
sha1-lookup.c	sha1-lookup: fix up the assertion message	2009-04-06 00:56:27 -07:00
sha1-lookup.h	sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1	2009-04-04 22:57:39 -07:00
sha1_file.c	Merge branch 'jc/shared-literally' into maint	2009-04-08 23:23:41 -07:00
sha1_name.c	Rename interpret/substitute nth_last_branch functions	2009-03-22 23:36:47 -07:00
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	strbuf_check_branch_ref(): a helper to check a refname for a branch	2009-03-22 23:52:11 -07:00
strbuf.h	strbuf_check_branch_ref(): a helper to check a refname for a branch	2009-03-22 23:52:11 -07:00
string-list.c	…
string-list.h	…
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
test-chmtime.c	…
test-ctype.c	…
test-date.c	…
test-delta.c	…
test-dump-cache-tree.c	…
test-genrandom.c	…
test-match-trees.c	…
test-parse-options.c	…
test-path-utils.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport.c	Merge branch 'db/push-cleanup'	2009-03-26 00:28:46 -07:00
transport.h	…
tree-diff.c	tree_entry_interesting: a pathspec only matches at directory boundary	2009-04-01 19:35:16 -07:00
tree-walk.c	…
tree-walk.h	…
tree.c	Merge branch 'bs/maint-1.6.0-tree-walk-prefix'	2009-04-07 22:33:10 -07:00
tree.h	…
unimplemented.sh	Makefile: allow building without perl	2009-04-08 22:14:56 -07:00
unpack-file.c	…
unpack-trees.c	Merge branch 'jc/attributes-checkout'	2009-03-26 00:27:33 -07:00
unpack-trees.h	…
update-server-info.c	…
upload-pack.c	list-objects: add "void *data" parameter to show functions	2009-04-07 22:12:38 -07:00
usage.c	Increase the size of the die/warning buffer to avoid truncation	2009-03-24 16:58:20 -07:00
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	…
var.c	…
walker.c	…
walker.h	…
wrapper.c	Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1	2009-03-21 22:53:36 -07:00
write_or_die.c	…
ws.c	…
wt-status.c	Merge branch 'mv/parseopt-ls-files'	2009-03-20 14:30:51 -07:00
wt-status.h	…
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/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.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.