No description
Find a file
Junio C Hamano 6758af89e4 Merge branch 'jn/git-cmd-h-bypass-setup'
* jn/git-cmd-h-bypass-setup:
  update-index -h: show usage even with corrupt index
  merge -h: show usage even with corrupt index
  ls-files -h: show usage even with corrupt index
  gc -h: show usage even with broken configuration
  commit/status -h: show usage even with broken configuration
  checkout-index -h: show usage even in an invalid repository
  branch -h: show usage even in an invalid repository

Conflicts:
	builtin/merge.c
2010-12-12 21:49:50 -08:00
block-sha1 msvc: Select the "fast" definition of the {get,put}_be32() macros 2010-06-27 21:59:32 -07:00
builtin Merge branch 'jn/git-cmd-h-bypass-setup' 2010-12-12 21:49:50 -08:00
compat Merge branch 'il/remote-fd-ext' 2010-12-08 11:24:14 -08:00
contrib Merge branch 'maint' 2010-12-09 10:45:53 -08:00
Documentation Relnotes: remove items fixed on 'maint' 2010-12-10 16:40:00 -08:00
git-gui Merge branch 'master' of git://repo.or.cz/git-gui 2010-11-05 10:41:09 -07:00
git_remote_helpers remote-helpers: build in platform independent directory 2010-09-27 10:42:50 -07:00
gitk-git
gitweb Merge branch 'jn/gitweb-time-hires-comes-with-5.8' 2010-12-08 11:25:04 -08:00
perl perl: bump the required Perl version to 5.8 from 5.6.[21] 2010-09-27 12:37:41 -07:00
ppc
t Merge branch 'jn/git-cmd-h-bypass-setup' 2010-12-12 21:49:50 -08:00
templates
vcs-svn vcs-svn: Fix some printf format compiler warnings 2010-09-12 10:24:55 -07:00
xdiff Merge branch 'cb/diff-fname-optim' into maint 2010-11-24 12:46:26 -08:00
.gitattributes
.gitignore git-remote-ext 2010-10-13 16:09:28 -07:00
.mailmap Martin Langhoff has a new e-mail address 2010-10-06 12:08:48 -07:00
abspath.c Fix 'clone' failure at DOS root directory. 2010-10-03 23:34:23 +01:00
aclocal.m4
advice.c
advice.h
alias.c split_cmdline: Allow caller to access error string 2010-08-11 09:36:23 -07:00
alloc.c
archive-tar.c
archive-zip.c
archive.c archive: improve --verbose description 2010-11-15 10:05:38 -08:00
archive.h
attr.c Add global and system-wide gitattributes 2010-09-01 12:19:36 -07:00
attr.h
base85.c Standardize do { ... } while (0) style 2010-08-12 15:44:51 -07:00
bisect.c bisect: use find_commit_subject() instead of custom code 2010-07-23 16:12:47 -07:00
bisect.h
blob.c
blob.h
branch.c builtin/checkout: handle -B from detached HEAD correctly 2010-08-09 12:57:17 -07:00
branch.h Change incorrect "remote branch" to "remote tracking branch" in C code 2010-11-03 09:20:47 -07:00
builtin.h Merge branch 'il/remote-fd-ext' 2010-12-08 11:24:14 -08:00
bundle.c bundle: detect if bundle file cannot be created 2010-08-27 16:46:26 -07:00
bundle.h
cache-tree.c cache_tree_free: Fix small memory leak 2010-09-06 17:32:28 -07:00
cache-tree.h
cache.h Merge branch 'pn/commit-autosquash' 2010-12-03 16:13:06 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c Merge branch 'rs/diff-no-minimal' into maint 2010-06-21 05:38:50 -07:00
command-list.txt
commit.c Merge branch 'pn/commit-autosquash' 2010-12-03 16:13:06 -08:00
commit.h pretty.c: teach format_commit_message() to reencode the output 2010-11-04 13:53:34 -07:00
config.c Merge branch 'jk/maint-decorate-01-bool' 2010-12-08 11:24:14 -08:00
config.mak.in Merge branch 'jj/icase-directory' 2010-12-03 16:10:34 -08:00
configure.ac Merge branch 'jj/icase-directory' 2010-12-03 16:10:34 -08:00
connect.c Make sure that git_getpass() never returns NULL 2010-09-30 12:22:02 -07:00
convert.c Don't expand CRLFs when normalizing text during merge 2010-07-02 15:45:18 -07:00
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'md/interix' 2010-11-29 17:52:34 -08:00
date.c Export parse_date_basic() to convert a date string to timestamp 2010-07-15 15:35:12 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c fix >4GiB source delta assertion failure 2010-08-21 23:53:26 -07:00
diff-lib.c Submodules: Add the new "ignore" config option for diff and status 2010-08-09 09:01:52 -07:00
diff-no-index.c string_list: Add STRING_LIST_INIT macro and make use of it. 2010-07-05 11:47:57 -07:00
diff.c Merge branch 'np/diff-in-corrupt-repository' into maint 2010-12-09 10:36:39 -08:00
diff.h Merge branch 'kb/merge-recursive-rename-threshold' 2010-10-26 21:54:04 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diffcore-pickaxe.c: a void function shouldn't try to return something 2010-10-06 13:45:18 -07:00
diffcore-rename.c
diffcore.h diff: pass the entire diff-options to diffcore_pickaxe() 2010-08-31 14:30:28 -07:00
dir.c Merge branch 'jj/icase-directory' 2010-12-03 16:10:34 -08:00
dir.h Add string comparison functions that respect the ignore_case variable. 2010-10-06 11:19:58 -07:00
editor.c
entry.c
environment.c Merge branch 'ks/maint-getenv-fix' 2010-12-08 11:24:13 -08:00
exec_cmd.c Merge branch 'cw/maint-exec-defpath' into maint 2010-06-16 16:33:47 -07:00
exec_cmd.h
fast-import.c Merge branch 'jj/icase-directory' 2010-12-03 16:10:34 -08:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'jl/add-p-reverse-message' into maint 2010-12-09 10:36:47 -08:00
git-am.sh Sync with 1.7.3.2 2010-10-21 17:16:10 -07:00
git-archimport.perl perl: use "use warnings" instead of -w 2010-09-27 12:37:56 -07:00
git-bisect.sh bisect: check for mandatory argument of 'bisect replay' 2010-10-13 15:07:50 -07:00
git-compat-util.h Merge branch 'jn/thinner-wrapper' 2010-12-03 16:13:06 -08:00
git-cvsexportcommit.perl perl: use "use warnings" instead of -w 2010-09-27 12:37:56 -07:00
git-cvsimport.perl Merge branch 'ab/require-perl-5.8' 2010-10-26 21:57:31 -07:00
git-cvsserver.perl Merge branch 'ab/require-perl-5.8' 2010-10-26 21:57:31 -07:00
git-difftool--helper.sh
git-difftool.perl perl: bump the required Perl version to 5.8 from 5.6.[21] 2010-09-27 12:37:41 -07:00
git-filter-branch.sh filter-branch: retire --remap-to-ancestor 2010-08-27 16:47:01 -07:00
git-instaweb.sh git instaweb: enable remote_heads 2010-11-17 13:04:52 -08:00
git-lost-found.sh
git-merge-octopus.sh merge-octopus: Work around environment issue on Windows 2010-10-01 23:08:46 +01:00
git-merge-one-file.sh build: propagate $DIFF to scripts 2010-06-05 09:36:13 -07:00
git-merge-resolve.sh
git-mergetool--lib.sh mergetool-lib: make the three-way diff the default for vim/gvim 2010-09-29 13:09:48 -07:00
git-mergetool.sh Merge branch 'cb/maint-mergetool-no-tty' 2010-09-03 09:43:44 -07:00
git-parse-remote.sh parse-remote: handle detached HEAD 2010-12-06 16:57:48 -08:00
git-pull.sh Porcelain scripts: Rewrite cryptic "needs update" error message 2010-10-28 13:28:44 -07:00
git-quiltimport.sh
git-rebase--interactive.sh Merge branch 'rr/needs-clean-work-tree' 2010-11-29 17:52:32 -08:00
git-rebase.sh Merge branch 'rr/needs-clean-work-tree' 2010-11-29 17:52:32 -08:00
git-relink.perl Merge branch 'ab/require-perl-5.8' into maint 2010-12-09 10:35:21 -08:00
git-remote-testgit.py Remove python 2.5'isms 2010-06-13 20:02:50 -07:00
git-repack.sh Merge branch 'tr/maint-git-repack-tmpfile' into maint 2010-11-24 12:47:10 -08:00
git-request-pull.sh
git-send-email.perl Merge branch 'ab/require-perl-5.8' into maint 2010-12-09 10:35:21 -08:00
git-sh-setup.sh Porcelain scripts: Rewrite cryptic "needs update" error message 2010-10-28 13:28:44 -07:00
git-stash.sh shell portability: no "export VAR=VAL" 2010-10-13 11:36:36 -07:00
git-submodule.sh Merge branch 'kb/maint-submodule-savearg' 2010-11-17 15:02:12 -08:00
git-svn.perl git-svn: allow the mergeinfo property to be set 2010-12-10 04:09:48 +08:00
GIT-VERSION-GEN Prepare for 1.7.3.3 2010-12-02 14:31:17 -08:00
git-web--browse.sh Add a google-chrome option for web--browse 2010-07-25 23:14:18 -07:00
git.c Merge branch 'il/remote-fd-ext' 2010-12-08 11:24:14 -08:00
git.spec.in git.spec.in: Add gitweb subpackage 2010-06-30 15:49:18 -07:00
graph.c Merge branch 'maint' 2010-08-22 20:18:37 -07:00
graph.h Enable custom schemes for column colors in the graph API 2010-07-13 16:33:02 -07:00
grep.c log --author: take union of multiple "author" requests 2010-09-13 01:11:55 -07:00
grep.h log --author: take union of multiple "author" requests 2010-09-13 01:11:55 -07:00
hash.c
hash.h
help.c
help.h builtin.h: Move two functions definitions to help.h. 2010-09-01 08:00:51 -07:00
hex.c
http-backend.c Merge branch 'jp/string-list-api-cleanup' 2010-06-30 11:55:38 -07:00
http-fetch.c
http-push.c
http-walker.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
http.c Merge branch 'gc/http-with-non-ascii-username-url' 2010-12-08 11:24:14 -08:00
http.h Standardize do { ... } while (0) style 2010-08-12 15:44:51 -07:00
ident.c
imap-send.c imap-send: Fix sprintf usage 2010-08-09 11:35:46 -07:00
INSTALL perl: bump the required Perl version to 5.8 from 5.6.[21] 2010-09-27 12:37:41 -07:00
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c merge-recursive --patience 2010-08-26 09:20:03 -07:00
ll-merge.h merge-recursive --patience 2010-08-26 09:20:03 -07:00
lockfile.c
log-tree.c Allow customizable commit decorations colors 2010-06-24 12:57:34 -07:00
log-tree.h Allow customizable commit decorations colors 2010-06-24 12:57:34 -07:00
mailmap.c mailmap: fix use of freed memory 2010-10-13 19:11:26 -07:00
mailmap.h
Makefile Makefile: transport-helper uses thread-utils.h 2010-12-10 12:57:59 -08:00
match-trees.c
merge-file.c ll-merge: replace flag argument with options struct 2010-08-26 09:18:51 -07:00
merge-recursive.c Merge branch 'en/merge-recursive' 2010-11-29 17:52:35 -08:00
merge-recursive.h Merge branch 'kb/merge-recursive-rename-threshold' 2010-10-26 21:54:04 -07:00
name-hash.c Add case insensitivity support for directories when using git status 2010-10-06 11:19:58 -07:00
notes-cache.c notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond 2010-11-17 13:21:02 -08:00
notes-cache.h
notes-merge.c git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" 2010-11-17 13:22:53 -08:00
notes-merge.h git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" 2010-11-17 13:22:53 -08:00
notes.c Merge branch 'jh/notes-merge' 2010-12-08 11:24:12 -08:00
notes.h Merge branch 'jh/notes-merge' 2010-12-08 11:24:12 -08:00
object.c Merge branch 'maint' 2010-09-06 00:12:04 -07:00
object.h object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
pack-check.c Typos in code comments, an error message, documentation 2010-08-22 13:25:08 -07:00
pack-refs.c pack-refs: remove newly empty directories 2010-07-07 09:11:37 -07:00
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h Merge branch 'sp/maint-dumb-http-pack-reidx' into maint 2010-06-16 16:21:30 -07:00
pager.c
parse-options.c parseopt: wrap rev-parse --parseopt usage for eval consumption 2010-06-13 09:38:14 -07:00
parse-options.h add OPT__FORCE 2010-11-15 10:04:43 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c path helpers: move git_mkstemp* to wrapper.c 2010-11-10 11:04:26 -08:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c pretty.c: teach format_commit_message() to reencode the output 2010-11-04 13:53:34 -07:00
progress.c
progress.h
quote.c quote.c: separate quoting and relative path generation 2010-06-05 09:14:13 -07:00
quote.h quote.c: separate quoting and relative path generation 2010-06-05 09:14:13 -07:00
reachable.c object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
reachable.h
read-cache.c Merge branch 'jj/icase-directory' 2010-12-03 16:10:34 -08:00
README
reflog-walk.c string_list: Fix argument order for string_list_lookup 2010-06-27 10:06:51 -07:00
reflog-walk.h
refs.c Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
refs.h setup_revisions(): Allow walking history in a submodule 2010-07-07 09:48:33 -07:00
RelNotes Prepare for 1.7.3.4 2010-12-10 16:35:00 -08:00
remote-curl.c Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint 2010-08-18 16:30:11 -07:00
remote.c Change "tracking branch" to "remote-tracking branch" 2010-11-03 09:20:41 -07:00
remote.h
replace_object.c
rerere.c Merge branch 'jf/merge-ignore-ws' 2010-10-26 21:40:54 -07:00
rerere.h
resolve-undo.c Convert the users of for_each_string_list to for_each_string_list_item macro 2010-07-05 11:44:35 -07:00
resolve-undo.h
revision.c Merge branch 'mm/shortopt-detached' 2010-08-21 23:28:31 -07:00
revision.h setup_revisions(): Allow walking history in a submodule 2010-07-07 09:48:33 -07:00
run-command.c Merge branch 'js/async-thread' 2010-06-21 06:02:45 -07:00
run-command.h
send-pack.h push: pass --progress down to git-pack-objects 2010-10-18 16:20:19 -07:00
server-info.c update-server-info: Shorten read_pack_info_file() 2010-07-19 11:13:52 -07:00
setup.c prefix_filename(): safely handle the case where pfx_len=0 2010-10-18 16:10:55 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jn/thinner-wrapper' 2010-12-03 16:13:06 -08:00
sha1_name.c Merge branch 'jn/thinner-wrapper' 2010-12-03 16:13:06 -08:00
shallow.c object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
shell.c shell: Display errors from improperly-formatted command lines 2010-08-27 10:43:59 -07:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c strbuf: move strbuf_branchname to sha1_name.c 2010-11-10 11:07:04 -08:00
strbuf.h strbuf.h: fix comment typo 2010-09-27 10:42:11 -07:00
string-list.c string_list: Fix argument order for string_list_append 2010-06-27 10:06:52 -07:00
string-list.h string_list: Add STRING_LIST_INIT macro and make use of it. 2010-07-05 11:47:57 -07:00
submodule.c Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
submodule.h Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
symlinks.c do not overwrite files in leading path 2010-10-13 14:34:09 -07:00
tag.c tag: recognize rfc1991 signatures 2010-11-10 09:40:35 -08:00
tag.h verify-tag: factor out signature detection 2010-11-10 09:39:56 -08:00
tar.h
test-chmtime.c
test-ctype.c
test-date.c test-date: fix sscanf type conversion 2010-07-06 08:42:15 -07:00
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c Add stream helper library 2010-08-14 19:35:37 -07:00
test-match-trees.c
test-obj-pool.c Add memory pool library 2010-08-14 19:35:37 -07:00
test-parse-options.c add description parameter to OPT__QUIET 2010-11-15 09:58:13 -08:00
test-path-utils.c
test-run-command.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-pool.c Add string-specific memory pool 2010-08-14 19:35:37 -07:00
test-svn-fe.c SVN dump parser 2010-08-14 19:35:38 -07:00
test-treap.c Add treap implementation 2010-08-14 19:35:37 -07:00
thread-utils.c
thread-utils.h thread-utils.h: simplify the inclusion 2010-12-10 12:58:06 -08:00
trace.c
transport-helper.c thread-utils.h: simplify the inclusion 2010-12-10 12:58:06 -08:00
transport.c push: pass --progress down to git-pack-objects 2010-10-18 16:20:19 -07:00
transport.h Add bidirectional_transfer_loop() 2010-10-13 16:08:58 -07:00
tree-diff.c Merge branch 'en/tree-walk-optim' 2010-10-26 21:37:49 -07:00
tree-walk.c unpack_trees: group error messages by type 2010-08-11 10:36:06 -07:00
tree-walk.h Merge branch 'maint' 2010-08-26 16:42:59 -07:00
tree.c
tree.h
unimplemented.sh
unpack-trees.c use persistent memory for rejected paths 2010-11-15 15:05:34 -08:00
unpack-trees.h use persistent memory for rejected paths 2010-11-15 15:05:34 -08:00
upload-pack.c Use angles for placeholders consistently 2010-10-08 12:29:52 -07:00
url.c Do not unquote + into ' ' in URLs 2010-07-25 21:57:23 -07:00
url.h
usage.c
userdiff.c userdiff.c: add builtin fortran regex patterns 2010-09-10 09:38:29 -07:00
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c Remove pack file handling dependency from wrapper.o 2010-11-10 11:11:07 -08:00
write_or_die.c
ws.c diff: handle lines containing only whitespace and tabs better 2010-10-20 16:10:15 -07:00
wt-status.c Merge branch 'kb/maint-status-cquote' 2010-12-03 16:13:06 -08:00
wt-status.h Merge branch 'jl/status-ignore-submodules' 2010-06-30 11:55:39 -07:00
xdiff-interface.c xdiff-interface.c: always trim trailing space from xfuncname matches 2010-09-09 17:18:29 -07:00
xdiff-interface.h
zlib.c wrapper: give zlib wrappers their own translation unit 2010-11-10 11:07:51 -08:00

////////////////////////////////////////////////////////////////

	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-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. 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.