Go to file
Junio C Hamano cd8c891b74 Merge branch 'dw/diff-no-index-doc'
When the user types "git diff" outside a working tree, thinking he
is inside one, the current error message that is a single-liner
"usage: git diff --no-index <path> <path>" may not be sufficient to
make him realize the mistake. Add "Not a git repository" to the
error message when we fell into the "--no-index" mode without an
explicit command line option to instruct us to do so.

* dw/diff-no-index-doc:
  diff --no-index: describe in a separate paragraph
  diff --no-index: clarify operation when not inside a repository
2013-09-17 11:42:44 -07:00
Documentation Merge branch 'dw/diff-no-index-doc' 2013-09-17 11:42:44 -07:00
block-sha1
builtin Merge branch 'fc/trivial' 2013-09-17 11:42:34 -07:00
compat Merge branch 'tb/precompose-autodetect-fix' 2013-09-17 11:39:59 -07:00
contrib Merge branch 'mm/mediawiki-dumb-push-fix' 2013-09-12 14:41:41 -07:00
git-gui
git_remote_helpers
gitk-git
gitweb Merge branch 'ab/gitweb-author-initials' 2013-09-17 11:42:27 -07:00
mergetools
perl Git.pm: revert _temp_cache use of temp_is_locked 2013-07-18 20:31:43 -07:00
po l10n: de.po: use "das Tag" instead of "der Tag" 2013-09-08 18:37:13 +02:00
ppc
t Merge branch 'jk/write-broken-index-with-nul-sha1' 2013-09-17 11:40:27 -07:00
templates Merge branch 'maint-1.8.3' into maint 2013-09-03 13:54:32 -07:00
vcs-svn
xdiff
.gitattributes
.gitignore Merge branch 'jc/url-match' 2013-09-09 14:50:36 -07:00
.mailmap Merge branch 'sb/mailmap-updates' 2013-08-13 10:49:33 -07:00
COPYING
GIT-VERSION-GEN Start the post-1.8.4 cycle 2013-08-30 10:16:16 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'sp/clip-read-write-to-8mb' 2013-09-09 14:50:39 -07:00
README
RelNotes Start the post-1.8.4 cycle 2013-08-30 10:16:16 -07:00
abspath.c
aclocal.m4
advice.c Rename advice.object_name_warning to objectNameWarning 2013-07-31 15:20:07 -07:00
advice.h Merge branch 'jk/gcc-function-attributes' 2013-07-22 11:23:59 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c Merge branch 'sb/archive-zip-double-assignment-fix' into maint 2013-07-19 10:40:53 -07:00
archive.c archive: convert to use parse_pathspec 2013-07-15 10:56:07 -07:00
archive.h archive: convert to use parse_pathspec 2013-07-15 10:56:07 -07:00
argv-array.c
argv-array.h Add the LAST_ARG_MUST_BE_NULL macro 2013-07-19 09:26:15 -07:00
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c branch: trivial style fix 2013-08-30 20:58:49 -07:00
branch.h
builtin.h
bulk-checkin.c stream_to_pack: xread does not guarantee to read all requested bytes 2013-08-20 11:20:53 -07:00
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jk/config-int-range-check' 2013-09-12 14:41:00 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
command-list.txt
commit-slab.h commit-slab.h: Fix memory allocation and addressing 2013-07-29 08:44:29 -07:00
commit.c Merge branch 'tr/log-full-diff-keep-true-parents' 2013-09-09 14:33:16 -07:00
commit.h Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
config.c Merge branch 'jk/config-int-range-check' 2013-09-12 14:41:00 -07:00
config.mak.in
config.mak.uname Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU" 2013-08-20 11:11:08 -07:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c typofix: in-code comments 2013-07-22 16:06:49 -07:00
convert.h typofix: in-code comments 2013-07-22 16:06:49 -07:00
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'sb/misc-fixes' 2013-07-24 19:20:59 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c create_delta_index: simplify condition always evaluating to true 2013-08-18 12:56:23 -07:00
diff-lib.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
diff-no-index.c Merge branch 'dw/diff-no-index-doc' 2013-09-17 11:42:44 -07:00
diff.c Merge branch 'jc/diff-filter-negation' 2013-09-09 14:28:35 -07:00
diff.h Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'jc/ls-files-killed-optim' 2013-09-11 15:03:28 -07:00
dir.h Merge branch 'jc/ls-files-killed-optim' 2013-09-11 15:03:28 -07:00
editor.c editor: use canonicalized absolute path 2013-07-29 12:15:27 -07:00
entry.c Merge branch 'nd/const-struct-cache-entry' 2013-07-22 11:24:01 -07:00
environment.c Merge branch 'jk/cat-file-batch-optim' 2013-07-24 19:21:21 -07:00
exec_cmd.c
exec_cmd.h Add the LAST_ARG_MUST_BE_NULL macro 2013-07-19 09:26:15 -07:00
fast-import.c Merge branch 'jk/fast-import-empty-ls' 2013-09-04 12:23:35 -07:00
fetch-pack.c Merge branch 'jc/push-cas' 2013-09-09 14:30:29 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'sp/clip-read-write-to-8mb' 2013-09-09 14:50:39 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh write_index: optionally allow broken null sha1s 2013-08-28 20:54:43 -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 many small typofixes 2013-07-29 12:32:25 -07:00
git-mergetool.sh
git-p4.py git-p4: Fix occasional truncation of symlink contents. 2013-08-12 10:10:46 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'fc/trivial' 2013-09-17 11:42:34 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'es/rebase-i-no-abbrev' 2013-09-11 15:02:29 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'rr/rebase-autostash' 2013-07-31 12:38:29 -07:00
git-relink.perl
git-remote-testgit.sh transport-helper: add no-private-update capability 2013-09-03 11:57:53 -07:00
git-remote-testpy.py
git-repack.sh
git-request-pull.sh request-pull: improve error message for invalid revision args 2013-07-17 12:30:58 -07:00
git-send-email.perl Merge branch 'rr/send-email-ssl-verify' 2013-07-22 11:24:17 -07:00
git-sh-i18n.sh
git-sh-setup.sh die_with_status: use "printf '%s\n'", not "echo" 2013-08-07 08:49:49 -07:00
git-stash.sh Revert "git stash: avoid data loss when "git stash save" kills a directory" 2013-08-14 09:53:43 -07:00
git-submodule.sh
git-svn.perl Merge branch 'vl/typofix' into maint 2013-07-19 10:42:57 -07:00
git-web--browse.sh
git.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash.c
hash.h
help.c cygwin: Remove the Win32 l/stat() implementation 2013-07-18 10:44:17 -07:00
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
http-walker.c
http.c Merge branch 'jc/url-match' 2013-09-09 14:50:36 -07:00
http.h
ident.c
imap-send.c imap-send: use Apple's Security framework for base64 encoding 2013-07-30 08:53:24 -07:00
kwset.c typofix: in-code comments 2013-07-22 16:06:49 -07:00
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
line-log.h range-set: publish API for re-use by git-blame -L 2013-08-06 14:27:20 -07:00
line-range.c line-range: reject -L line numbers less than 1 2013-08-06 14:48:55 -07:00
line-range.h line-range: teach -L/RE/ to search relative to anchor point 2013-08-06 14:36:34 -07:00
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c log: use true parents for diff even when rewriting 2013-08-01 10:25:48 -07:00
log-tree.h
mailmap.c Merge branch 'sb/mailmap-freeing-NULL-is-ok' 2013-09-11 15:00:43 -07:00
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c remove diff_tree_{setup,release}_paths 2013-07-15 10:56:09 -07:00
notes-merge.h
notes-utils.c
notes-utils.h typofix: commit is spelled with two ems 2013-09-04 15:30:03 -07:00
notes.c
notes.h many small typofixes 2013-07-29 12:32:25 -07:00
object.c Merge branch 'sb/parse-object-buffer-eaten' 2013-07-22 11:23:33 -07:00
object.h
pack-check.c
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c parse-options: add OPT_CMDMODE() 2013-07-30 12:23:31 -07:00
parse-options.h Merge branch 'sb/parseopt-boolean-removal' 2013-09-04 12:39:03 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
pathspec.c Merge branch 'nd/magic-pathspec' 2013-09-09 14:50:44 -07:00
pathspec.h Merge branch 'nd/magic-pathspec' 2013-09-09 14:50:44 -07:00
pkt-line.c
pkt-line.h
preload-index.c convert read_cache_preload() to take struct pathspec 2013-07-15 10:56:08 -07:00
pretty.c
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c quote: remove sq_quote_print() 2013-07-30 08:13:38 -07:00
quote.h quote: remove sq_quote_print() 2013-07-30 08:13:38 -07:00
reachable.c
reachable.h
read-cache.c Merge branch 'jk/write-broken-index-with-nul-sha1' 2013-09-17 11:40:27 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jc/push-cas' 2013-09-09 14:30:29 -07:00
refs.h
remote-curl.c Merge branch 'jc/push-cas' 2013-09-09 14:30:29 -07:00
remote-testsvn.c
remote.c Merge branch 'jc/push-cas' 2013-09-09 14:30:29 -07:00
remote.h Merge branch 'jc/push-cas' 2013-09-09 14:30:29 -07:00
replace_object.c
rerere.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
rerere.h rerere: convert to use parse_pathspec 2013-07-15 10:56:07 -07:00
resolve-undo.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
resolve-undo.h convert unmerge_cache to take struct pathspec 2013-07-15 10:56:08 -07:00
revision.c Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
revision.h log: use true parents for diff even when rewriting 2013-08-01 10:25:48 -07:00
run-command.c Merge branch 'tr/fd-gotcha-fixes' 2013-07-22 11:23:13 -07:00
run-command.h Add the LAST_ARG_MUST_BE_NULL macro 2013-07-19 09:26:15 -07:00
send-pack.c push --force-with-lease: tie it all together 2013-07-22 22:33:21 -07:00
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/has-sha1-file-retry-packed' 2013-09-17 11:41:35 -07:00
sha1_name.c Revert "Add new @ shortcut for HEAD" 2013-08-14 15:04:24 -07:00
shallow.c Merge branch 'mk/upload-pack-off-by-one-dead-code-removal' 2013-07-22 11:24:05 -07:00
shell.c Merge branch 'tr/protect-low-3-fds' 2013-07-22 11:23:35 -07:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c Merge branch 'jk/cat-file-batch-optim' 2013-07-24 19:21:21 -07:00
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
submodule.h rm: delete .gitmodules entry of submodules removed from the work tree 2013-08-06 14:11:00 -07:00
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-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c builtin/config.c: compilation fix 2013-08-09 09:20:38 -07:00
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c Merge branch 'mm/mediawiki-dumb-push-fix' 2013-09-12 14:41:41 -07:00
transport.c Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' 2013-09-09 14:50:37 -07:00
transport.h Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' 2013-09-09 14:50:37 -07:00
tree-diff.c pathspec: support :(literal) syntax for noglob pathspec 2013-07-15 10:56:09 -07:00
tree-walk.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
tree-walk.h
tree.c Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
tree.h Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c unpack-trees: plug a memory leak 2013-08-13 14:37:30 -07:00
unpack-trees.h
upload-pack.c
url.c
url.h
urlmatch.c config: add generic callback wrapper to parse section.<url>.key 2013-07-31 14:58:42 -07:00
urlmatch.h config: add generic callback wrapper to parse section.<url>.key 2013-07-31 14:58:42 -07:00
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c xread, xwrite: limit size of IO to 8MB 2013-08-20 11:10:59 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
wt-status.h Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c

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 version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

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 (read
Documentation/SubmittingPatches for instructions on patch submission).
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://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.