kernel/git - git - PowerEL Git System

Go to file

Shawn O. Pearce 5a139ba483 Merge branch 'maint' into bc/master-diff-hunk-header-fix * maint: (41 commits) Clarify commit error message for unmerged files Use strchrnul() instead of strchr() plus manual workaround Use remove_path from dir.c instead of own implementation Add remove_path: a function to remove as much as possible of a path git-submodule: Fix "Unable to checkout" for the initial 'update' Clarify how the user can satisfy stash's 'dirty state' check. Remove empty directories in recursive merge Documentation: clarify the details of overriding LESS via core.pager Update release notes for 1.6.0.3 checkout: Do not show local changes when in quiet mode for-each-ref: Fix --format=%(subject) for log message without newlines git-stash.sh: don't default to refs/stash if invalid ref supplied maint: check return of split_cmdline to avoid bad config strings builtin-prune.c: prune temporary packs in <object_dir>/pack directory Do not perform cross-directory renames when creating packs Use dashless git commands in setgitperms.perl git-remote: do not use user input in a printf format string make "git remote" report multiple URLs Start draft release notes for 1.6.0.3 git-repack uses --no-repack-object, not --no-repack-delta. ... Conflicts: RelNotes		2008-09-29 10:52:34 -07:00
Documentation	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
arm	…
compat	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	2008-09-18 20:32:50 -07:00
contrib	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
git-gui	Merge updated git-gui and gitk that call each other	2008-09-06 18:06:39 -07:00
gitk-git	Merge updated git-gui and gitk that call each other	2008-09-06 18:06:39 -07:00
gitweb	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
mozilla-sha1	…
perl	Git.pm: Use File::Temp->tempfile instead of ->new	2008-09-10 11:45:22 -07:00
ppc	…
t	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
templates	Fix permission bits on sources checked out with an overtight umask	2008-09-09 13:32:32 -07:00
xdiff	…
.gitattributes	…
.gitignore	Update .gitignore to ignore git-help	2008-08-13 23:46:03 -07:00
.mailmap	…
COPYING	…
GIT-VERSION-GEN	GIT 1.6.0.2	2008-09-12 16:18:47 -07:00
INSTALL	…
Makefile	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	2008-09-18 20:32:50 -07:00
README	…
RelNotes	Start draft release notes for 1.6.0.3	2008-09-19 23:15:13 -07:00
abspath.c	…
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	pretty=format: respect date format options	2008-08-29 00:14:29 -07:00
archive.h	…
attr.c	…
attr.h	…
base85.c	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin-add.c	Merge branch 'jc/add-addremove'	2008-08-27 16:39:57 -07:00
builtin-annotate.c	…
builtin-apply.c	Use remove_path from dir.c instead of own implementation	2008-09-29 08:37:07 -07:00
builtin-archive.c	Make git archive respect core.autocrlf when creating zip format archives	2008-09-18 19:49:28 -07:00
builtin-blame.c	Merge branch 'maint'	2008-09-06 16:47:32 -07:00
builtin-branch.c	…
builtin-bundle.c	Start conforming code to "git subcmd" style	2008-08-30 13:50:48 -07:00
builtin-cat-file.c	Start conforming code to "git subcmd" style	2008-08-30 13:50:48 -07:00
builtin-check-attr.c	…
builtin-check-ref-format.c	Start conforming code to "git subcmd" style	2008-08-30 13:50:48 -07:00
builtin-checkout-index.c	Start conforming code to "git subcmd" style part 2	2008-09-09 08:41:29 -07:00
builtin-checkout.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
builtin-clean.c	…
builtin-clone.c	builtin-clone: fix typo	2008-09-19 22:05:31 -07:00
builtin-commit-tree.c	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	2008-09-18 20:32:50 -07:00
builtin-commit.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
builtin-config.c	…
builtin-count-objects.c	Merge branch 'mg/count-objects'	2008-08-20 23:41:54 -07:00
builtin-describe.c	…
builtin-diff-files.c	diff/diff-files: do not use --cc too aggressively	2008-09-18 10:49:03 -07:00
builtin-diff-index.c	diff*: fix worktree setup	2008-08-28 20:50:10 -07:00
builtin-diff-tree.c	…
builtin-diff.c	diff/diff-files: do not use --cc too aggressively	2008-09-18 10:49:03 -07:00
builtin-fast-export.c	Fix a warning (on cygwin) to allow -Werror	2008-08-26 16:22:00 -07:00
builtin-fetch--tool.c	…
builtin-fetch-pack.c	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	2008-09-18 20:32:50 -07:00
builtin-fetch.c	Start conforming code to "git subcmd" style part 2	2008-09-09 08:41:29 -07:00
builtin-fmt-merge-msg.c	…
builtin-for-each-ref.c	Use strchrnul() instead of strchr() plus manual workaround	2008-09-29 08:56:26 -07:00
builtin-fsck.c	…
builtin-gc.c	…
builtin-grep.c	Merge branch 'nd/worktree' into maint	2008-09-03 15:35:37 -07:00
builtin-help.c	builtin-help: fallback to GIT_MAN_VIEWER before man	2008-08-29 21:46:33 -07:00
builtin-http-fetch.c	Start conforming code to "git subcmd" style part 2	2008-09-09 08:41:29 -07:00
builtin-init-db.c	Start conforming code to "git subcmd" style part 3	2008-09-15 23:11:35 -07:00
builtin-log.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
builtin-ls-files.c	'git foo' program identifies itself without dash in die() messages	2008-08-31 09:39:19 -07:00
builtin-ls-remote.c	…
builtin-ls-tree.c	…
builtin-mailinfo.c	mailinfo: avoid violating strbuf assertion	2008-08-19 19:36:56 -07:00
builtin-mailsplit.c	…
builtin-merge-base.c	…
builtin-merge-file.c	…
builtin-merge-ours.c	…
builtin-merge-recursive.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
builtin-merge.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
builtin-mv.c	…
builtin-name-rev.c	…
builtin-pack-objects.c	Do not perform cross-directory renames when creating packs	2008-09-22 12:19:14 -07:00
builtin-pack-refs.c	…
builtin-prune-packed.c	…
builtin-prune.c	builtin-prune.c: prune temporary packs in <object_dir>/pack directory	2008-09-23 01:53:07 -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	Merge branch 'jc/maint-checkout-keep-remove' into maint	2008-09-18 19:53:22 -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	Merge branch 'mg/maint-remote-fix' into maint	2008-09-29 09:39:53 -07:00
builtin-rerere.c	…
builtin-reset.c	…
builtin-rev-list.c	Start conforming code to "git subcmd" style part 3	2008-09-15 23:11:35 -07:00
builtin-rev-parse.c	…
builtin-revert.c	Make cherry-pick use rerere for conflict resolution.	2008-08-11 16:42:49 -07:00
builtin-rm.c	Use remove_path from dir.c instead of own implementation	2008-09-29 08:37:07 -07:00
builtin-send-pack.c	Start conforming code to "git subcmd" style part 3	2008-09-15 23:11:35 -07:00
builtin-shortlog.c	…
builtin-show-branch.c	…
builtin-show-ref.c	'git foo' program identifies itself without dash in die() messages	2008-08-31 09:39:19 -07:00
builtin-stripspace.c	…
builtin-symbolic-ref.c	…
builtin-tag.c	…
builtin-tar-tree.c	Cosmetical command name fix	2008-09-15 23:11:35 -07:00
builtin-unpack-objects.c	Start conforming code to "git subcmd" style part 3	2008-09-15 23:11:35 -07:00
builtin-update-index.c	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	2008-09-18 20:32:50 -07:00
builtin-update-ref.c	…
builtin-upload-archive.c	…
builtin-verify-pack.c	discard revindex data when pack list changes	2008-08-22 22:00:22 -07:00
builtin-verify-tag.c	…
builtin-write-tree.c	…
builtin.h	Revert "Build-in "git-shell""	2008-08-25 22:39:17 -07:00
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'jc/add-addremove'	2008-08-27 16:39:57 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
combine-diff.c	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	2008-09-18 20:32:50 -07:00
command-list.txt	…
commit.c	…
commit.h	Merge branch 'maint'	2008-08-29 00:16:39 -07:00
config.c	…
config.mak.in	config.mak.in: Pass on LDFLAGS from configure	2008-08-21 23:16:57 -07:00
configure.ac	…
connect.c	'git foo' program identifies itself without dash in die() messages	2008-08-31 09:39:19 -07:00
convert.c	…
copy.c	…
csum-file.c	pack-objects: use fixup_pack_header_footer()'s validation mode	2008-08-29 21:51:27 -07:00
csum-file.h	…
ctype.c	dir.c: Avoid c99 array initialization	2008-08-28 21:49:51 -07:00
daemon.c	cast pid_t's to uintmax_t to improve portability	2008-08-31 16:56:22 -07:00
date.c	…
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	…
diff-no-index.c	…
diff.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
diff.h	diff --cumulative is a sub-option of --dirstat	2008-09-03 22:37:03 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	Bust the ghost of long-defunct diffcore-pathspec.	2008-09-19 19:48:30 -07:00
dir.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
dir.h	Add remove_path: a function to remove as much as possible of a path	2008-09-29 08:37:07 -07:00
dump-cache-tree.c	…
editor.c	…
entry.c	'git foo' program identifies itself without dash in die() messages	2008-08-31 09:39:19 -07:00
environment.c	…
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
fetch-pack.h	…
fixup-builtins	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	…
git-am.sh	git-am: ignore --binary option	2008-08-16 02:32:36 -07:00
git-archimport.perl	…
git-bisect.sh	Merge branch 'maint'	2008-08-11 19:24:28 -07:00
git-compat-util.h	dir.c: Avoid c99 array initialization	2008-08-28 21:49:51 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-filter-branch.sh	Merge branch 'tr/filter-branch'	2008-09-02 17:47:13 -07:00
git-instaweb.sh	…
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool.sh	…
git-parse-remote.sh	…
git-pull.sh	…
git-quiltimport.sh	…
git-rebase--interactive.sh	git-rebase--interactive: auto amend only edited commit	2008-09-09 08:57:21 -07:00
git-rebase.sh	Improve error output of git-rebase	2008-08-16 23:21:18 -07:00
git-relink.perl	…
git-repack.sh	git-repack uses --no-repack-object, not --no-repack-delta.	2008-09-19 22:23:14 -07:00
git-request-pull.sh	…
git-send-email.perl	…
git-sh-setup.sh	…
git-stash.sh	Clarify how the user can satisfy stash's 'dirty state' check.	2008-09-29 08:13:10 -07:00
git-submodule.sh	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
git-svn.perl	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
git-web--browse.sh	…
git.c	maint: check return of split_cmdline to avoid bad config strings	2008-09-24 08:58:14 -07:00
git.spec.in	…
graph.c	…
graph.h	…
grep.c	log --author/--committer: really match only with name part	2008-09-04 22:21:56 -07:00
grep.h	log --author/--committer: really match only with name part	2008-09-04 22:21:56 -07:00
hash-object.c	…
hash.c	…
hash.h	…
help.c	list_commands: only call git_exec_path if it is needed	2008-08-28 21:51:34 -07:00
help.h	Remove calculation of the longest command name from where it is not used	2008-08-28 21:49:55 -07:00
http-push.c	…
http-walker.c	…
http.c	Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set	2008-09-07 09:57:44 -07:00
http.h	…
ident.c	…
imap-send.c	…
index-pack.c	Do not perform cross-directory renames when creating packs	2008-09-22 12:19:14 -07:00
interpolate.c	…
interpolate.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
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	…
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-index.c	'git foo' program identifies itself without dash in die() messages	2008-08-31 09:39:19 -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	discard revindex data when pack list changes	2008-08-22 22:00:22 -07:00
pack-revindex.h	discard revindex data when pack list changes	2008-08-22 22:00:22 -07:00
pack-write.c	Do not perform cross-directory renames when creating packs	2008-09-22 12:19:14 -07:00
pack.h	improve reliability of fixup_pack_header_footer()	2008-08-29 21:51:27 -07:00
pager.c	…
parse-options.c	…
parse-options.h	…
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	pretty=format: respect date format options	2008-08-29 00:14:29 -07:00
progress.c	…
progress.h	…
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -07:00
receive-pack.c	cast pid_t's to uintmax_t to improve portability	2008-08-31 16:56:22 -07:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
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	…
rerere.h	…
revision.c	Merge branch 'jc/maint-log-grep'	2008-09-04 22:30:44 -07:00
revision.h	Merge branch 'tr/filter-branch'	2008-09-02 17:47:13 -07:00
run-command.c	Merge branch 'jk/pager-swap'	2008-08-19 21:42:55 -07:00
run-command.h	…
send-pack.h	…
server-info.c	…
setup.c	setup_git_directory(): fix move to worktree toplevel directory	2008-08-30 23:41:12 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'maint' into bc/master-diff-hunk-header-fix	2008-09-29 10:52:34 -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	shell: do not play duplicated definition games to shrink the executable	2008-08-29 22:38:41 -07:00
shortlog.h	…
show-index.c	…
sideband.c	improve handling of sideband message display	2008-09-03 14:51:10 -07:00
sideband.h	…
strbuf.c	…
strbuf.h	…
string-list.c	…
string-list.h	…
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	…
transport.h	…
tree-diff.c	'git foo' program identifies itself without dash in die() messages	2008-08-31 09:39:19 -07:00
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unpack-file.c	…
unpack-trees.c	checkout: do not lose staged removal	2008-09-09 22:55:22 -07:00
unpack-trees.h	checkout: do not lose staged removal	2008-09-09 22:55:22 -07:00
update-server-info.c	…
upload-pack.c	'git foo' program identifies itself without dash in die() messages	2008-08-31 09:39:19 -07:00
usage.c	…
utf8.c	…
utf8.h	…
var.c	…
walker.c	…
walker.h	…
wrapper.c	…
write_or_die.c	…
ws.c	…
wt-status.c	…
wt-status.h	…
xdiff-interface.c	diff: fix "multiple regexp" semantics to find hunk header comment	2008-09-20 00:52:11 -07:00
xdiff-interface.h	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	2008-09-18 20:32:50 -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.