Go to file
Junio C Hamano 8d676d85f7 Merge branch 'gv/portable'
* gv/portable:
  test-lib: use DIFF definition from GIT-BUILD-OPTIONS
  build: propagate $DIFF to scripts
  Makefile: Tru64 portability fix
  Makefile: HP-UX 10.20 portability fixes
  Makefile: HPUX11 portability fixes
  Makefile: SunOS 5.6 portability fix
  inline declaration does not work on AIX
  Allow disabling "inline"
  Some platforms lack socklen_t type
  Make NO_{INET_NTOP,INET_PTON} configured independently
  Makefile: some platforms do not have hstrerror anywhere
  git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
  test_cmp: do not use "diff -u" on platforms that lack one
  fixup: do not unconditionally disable "diff -u"
  tests: use "test_cmp", not "diff", when verifying the result
  Do not use "diff" found on PATH while building and installing
  enums: omit trailing comma for portability
  Makefile: -lpthread may still be necessary when libc has only pthread stubs
  Rewrite dynamic structure initializations to runtime assignment
  Makefile: pass CPPFLAGS through to fllow customization

Conflicts:
	Makefile
	wt-status.h
2010-06-21 06:02:44 -07:00
Documentation Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
block-sha1
builtin Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
compat Merge branch 'np/malloc-threading' into maint 2010-06-16 16:21:06 -07:00
contrib Merge branch 'em/checkout-orphan' 2010-06-21 06:02:41 -07:00
git-gui
git_remote_helpers Remove python 2.5'isms 2010-06-13 20:02:50 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2010-04-18 18:36:41 -07:00
gitweb Merge branch 'jn/gitweb-fastcgi' 2010-06-21 06:02:42 -07:00
perl
ppc
t Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
templates
xdiff xdiff/xmerge.c: use memset() instead of explicit for-loop 2010-05-01 11:11:11 -07:00
.gitattributes
.gitignore Merge branch 'sr/remote-helper-export' 2010-05-21 04:02:15 -07:00
.mailmap Merge branch 'mg/mailmap-update' into maint 2010-04-09 22:22:06 -07:00
COPYING
GIT-VERSION-GEN Merge branch 'maint' 2010-05-11 23:04:47 -07:00
INSTALL
Makefile Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
README
RelNotes Prepare draft release notes to 1.7.1.1 2010-06-16 17:00:53 -07:00
abspath.c
aclocal.m4 Some platforms lack socklen_t type 2010-05-31 17:36:27 -07:00
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c attr: Expand macros immediately when encountered. 2010-04-10 18:36:00 -07:00
attr.h enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint 2010-04-11 13:39:47 -07:00
branch.h
builtin.h Merge branch 'tc/merge-m-log' 2010-06-18 11:16:54 -07:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c diff: add --word-diff option that generalizes --color-words 2010-04-14 10:56:53 -07:00
color.h diff: add --word-diff option that generalizes --color-words 2010-04-14 10:56:53 -07:00
combine-diff.c Merge branch 'rs/diff-no-minimal' into maint 2010-06-21 05:38:50 -07:00
command-list.txt
commit.c
commit.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
config.c Merge branch 'ld/discovery-limit-to-fs' (early part) 2010-05-21 04:02:15 -07:00
config.mak.in Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
configure.ac Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
connect.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
convert.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
copy.c
csum-file.c
csum-file.h
ctype.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
daemon.c Rewrite dynamic structure initializations to runtime assignment 2010-05-31 16:59:26 -07:00
date.c Add "Z" as an alias for the timezone "UTC" 2010-05-18 22:00:17 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c test get_git_work_tree() return value for NULL 2010-05-25 09:28:51 -07:00
diff.c Merge branch 'bw/diff-metainfo-color' into maint 2010-06-21 05:40:10 -07:00
diff.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
diffcore-break.c Add a macro DIFF_QUEUE_CLEAR. 2010-05-07 09:34:27 -07:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c Add a macro DIFF_QUEUE_CLEAR. 2010-05-07 09:34:27 -07:00
diffcore-rename.c Add a macro DIFF_QUEUE_CLEAR. 2010-05-07 09:34:27 -07:00
diffcore.h Make diffcore_std only can run once before a diff_flush 2010-05-07 09:34:28 -07:00
dir.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
dir.h
editor.c
entry.c
environment.c
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 'gv/portable' 2010-06-21 06:02:44 -07:00
fetch-pack.h
fixup-builtins
fsck.c fsck: fix bogus commit header check 2010-05-28 15:08:27 -07:00
fsck.h
generate-cmdlist.sh
git-add--interactive.perl add-interactive: Clarify “remaining hunks in the file” 2010-06-13 10:05:02 -07:00
git-am.sh Merge branch 'rr/am-help' 2010-06-18 11:16:56 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl git-cvsserver: fix error for invalid password formats 2010-06-20 21:58:26 -07:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh git-instaweb: Add support for running gitweb via 'plackup' 2010-06-02 11:54:06 -07:00
git-lost-found.sh
git-merge-octopus.sh
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
git-mergetool.sh
git-parse-remote.sh
git-pull.sh pull: do nothing on --dry-run 2010-05-25 10:49:54 -07:00
git-quiltimport.sh
git-rebase--interactive.sh rebase-interactive: silence warning when no commits rewritten 2010-04-18 11:41:53 -07:00
git-rebase.sh rebase: improve error message when upstream argument is missing 2010-05-31 17:53:23 -07:00
git-relink.perl
git-remote-testgit.py Remove python 2.5'isms 2010-06-13 20:02:50 -07:00
git-repack.sh
git-request-pull.sh git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh 2010-06-02 09:28:12 -07:00
git-send-email.perl Merge branch 'bg/send-email-smtpdomain' into maint 2010-06-16 16:20:06 -07:00
git-sh-setup.sh
git-stash.sh Merge branch 'cb/maint-stash-orphaned-file' 2010-05-21 04:02:23 -07:00
git-submodule.sh git-submodule foreach: Add $toplevel variable 2010-05-25 09:04:24 -07:00
git-svn.perl git svn: avoid unnecessary '/' in paths for SVN 2010-06-14 04:49:22 +00:00
git-web--browse.sh git-web--browse: Add support for google chrome and chromium 2010-05-31 18:03:39 -07:00
git.c
git.spec.in
graph.c graph.c: register a callback for graph output 2010-05-31 18:02:07 -07:00
graph.h
grep.c grep: support NUL chars in search strings for -F 2010-05-24 11:22:07 -07:00
grep.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c make url-related functions reusable 2010-05-24 16:48:32 -07:00
http-fetch.c
http-push.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
http-walker.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
http.c Merge branch 'sc/http-late-auth' into maint 2010-06-16 16:32:15 -07:00
http.h Merge branch 'sc/http-late-auth' into maint 2010-06-16 16:32:15 -07:00
ident.c
imap-send.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c Rewrite dynamic structure initializations to runtime assignment 2010-05-31 16:59:26 -07:00
ll-merge.h
lockfile.c
log-tree.c Output the graph columns at the end of the commit message 2010-05-31 18:00:21 -07:00
log-tree.h
mailmap.c
mailmap.h
match-trees.c
merge-file.c Merge branch 'rs/diff-no-minimal' into maint 2010-06-21 05:38:50 -07:00
merge-recursive.c Merge branch 'pc/remove-warn' 2010-05-08 22:32:59 -07:00
merge-recursive.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
name-hash.c
notes-cache.c
notes-cache.h
notes.c notes: dry-run and verbose options for prune 2010-05-19 23:57:18 -07:00
notes.h notes: dry-run and verbose options for prune 2010-05-19 23:57:18 -07:00
object.c fix "bundle --stdin" segfault 2010-04-19 22:16:35 -07:00
object.h
pack-check.c Extract verify_pack_index for reuse from verify_pack 2010-04-19 17:56:13 -07:00
pack-refs.c
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
parse-options.h enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -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
reachable.h
read-cache.c
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
refs.h log_ref_setup: don't return stack-allocated array 2010-06-12 09:34:17 -07:00
remote-curl.c Merge branch 'sc/http-late-auth' into maint 2010-06-16 16:32:15 -07:00
remote.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
remote.h enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
replace_object.c
rerere.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
revision.h
run-command.c start_command: close cmd->err descriptor when fork/spawn fails 2010-05-20 16:11:29 -07:00
run-command.h
send-pack.h
server-info.c
setup.c Merge branch 'maint' 2010-06-06 18:42:12 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/maint-sha1-file-name-fix' into maint 2010-06-21 05:40:41 -07:00
sha1_name.c
shallow.c
shell.c
shortlog.h pretty: Respect --abbrev option 2010-05-04 15:38:58 -07:00
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
string-list.c
string-list.h
submodule.c Teach diff --submodule and status to handle .git files in submodules 2010-04-10 11:51:56 -07:00
submodule.h
symlinks.c
tag.c tag.c: Parse tagger date (if present) 2010-04-12 21:45:17 -07:00
tag.h tag.c: Parse tagger date (if present) 2010-04-12 21:45:17 -07:00
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-match-trees.c
test-parse-options.c
test-path-utils.c
test-run-command.c
test-sha1.c
test-sha1.sh
test-sigchain.c
thread-utils.c
thread-utils.h
trace.c Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used 2010-05-08 22:28:01 -07:00
transport-helper.c
transport.c make url-related functions reusable 2010-05-24 16:48:32 -07:00
transport.h
tree-diff.c Make git log --follow find copies among unmodified files. 2010-05-07 09:34:29 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
unpack-trees.h
upload-pack.c
url.c make url-related functions reusable 2010-05-24 16:48:32 -07:00
url.h make url-related functions reusable 2010-05-24 16:48:32 -07:00
usage.c
userdiff.c Merge branch 'bs/userdiff-php' 2010-06-13 11:22:05 -07:00
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c Merge branch 'js/try-to-free-stackable' 2010-06-13 11:21:21 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
wt-status.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
xdiff-interface.c Merge branch 'maint-1.7.0' into maint 2010-05-04 15:20:47 -07:00
xdiff-interface.h Merge branch 'maint-1.7.0' into maint 2010-05-04 15:20:47 -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/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.