1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 00:37:55 +01:00
Find a file
Junio C Hamano 1bdd46cd3a Merge branch 'tr/word-diff'
* tr/word-diff:
  diff: add --word-diff option that generalizes --color-words

Conflicts:
	diff.c
2010-05-21 04:02:17 -07:00
block-sha1
builtin Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' 2010-05-21 04:02:17 -07:00
compat Merge branch 'np/malloc-threading' 2010-05-21 04:02:16 -07:00
contrib post-receive-email: document command-line mode 2010-05-19 20:45:30 -07:00
Documentation Merge branch 'tr/word-diff' 2010-05-21 04:02:17 -07:00
git-gui
git_remote_helpers Merge branch 'sr/remote-helper-export' 2010-05-21 04:02:15 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2010-04-18 18:36:41 -07:00
gitweb gitweb: Use @diff_opts while using format-patch 2010-05-18 21:45:04 -07:00
perl git-svn: support fetch with autocrlf on 2010-03-05 02:57:57 -08:00
ppc
t Merge branch 'tr/word-diff' 2010-05-21 04:02:17 -07:00
templates Modernize git calling conventions in hook templates 2010-03-20 09:04:38 -07:00
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
abspath.c
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
base85.c
bisect.c Merge branch 'cc/maint-bisect-paths' into maint-1.6.6 2010-03-07 14:53:35 -08:00
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 make commit_tree a library function 2010-04-01 23:53:54 -07:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'ld/discovery-limit-to-fs' (early part) 2010-05-21 04:02:15 -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 remove ecb parameter from xdi_diff_outf() 2010-05-04 15:19:14 -07:00
command-list.txt
commit.c make commit_tree a library function 2010-04-01 23:53:54 -07:00
commit.h Merge branch 'jk/cached-textconv' 2010-05-08 22:33:08 -07:00
config.c Merge branch 'ld/discovery-limit-to-fs' (early part) 2010-05-21 04:02:15 -07:00
config.mak.in
configure.ac Gitweb: add autoconfigure support for minifiers 2010-04-02 21:23:38 -07:00
connect.c Merge branch 'fl/askpass' 2010-03-20 11:29:35 -07:00
convert.c Merge branch 'sp/maint-push-sideband' into maint 2010-03-02 22:54:50 -08:00
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'bc/maint-daemon-sans-ss-family' into maint 2010-04-09 22:22:00 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'jl/submodule-diff-dirtiness' 2010-03-24 16:25:43 -07:00
diff-no-index.c
diff.c Merge branch 'tr/word-diff' 2010-05-21 04:02:17 -07:00
diff.h diff: add --word-diff option that generalizes --color-words 2010-04-14 10:56:53 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h git diff --submodule: Show detailed dirty status of submodules 2010-03-04 22:16:33 -08:00
dir.c Merge branch 'jk/maint-add-ignored-dir' into maint 2010-03-24 16:24:03 -07:00
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c fast-import: always create marks_file directories 2010-03-31 09:37:26 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'jk/maint-add--interactive-delete' into maint 2010-03-08 00:36:00 -08:00
git-am.sh Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'np/malloc-threading' 2010-05-21 04:02:16 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl difftool: Fix '--gui' when diff.guitool is unconfigured 2010-03-28 09:29:12 -07:00
git-filter-branch.sh
git-instaweb.sh git-instaweb: pass through invoking user's path to gitweb CGI scripts 2010-04-17 12:40:20 -07:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh Merge branch 'maint' 2010-03-20 11:29:19 -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 Merge branch 'mb/rebase-i-no-ff' 2010-04-03 12:28:44 -07:00
git-relink.perl
git-remote-testgit.py Makefile: Simplify handling of python scripts 2010-04-09 20:47:22 -07:00
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'bg/send-email-smtpdomain' 2010-05-08 22:37:34 -07:00
git-sh-setup.sh Merge branch 'gb/maint-submodule-env' into maint 2010-03-08 00:36:02 -08:00
git-stash.sh Merge branch 'sd/log-decorate' 2010-05-08 22:36:14 -07:00
git-submodule.sh Merge branch 'sd/log-decorate' 2010-05-08 22:36:14 -07:00
git-svn.perl git-svn: mangle refnames forbidden in git 2010-05-09 01:25:19 -07:00
GIT-VERSION-GEN Merge branch 'maint' 2010-05-11 23:04:47 -07:00
git-web--browse.sh
git.c Allow passing of configuration parameters in the command line 2010-03-28 09:48:25 -07:00
git.spec.in RPM spec: include bash completion support 2010-03-29 09:40:06 -07:00
graph.c Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_* 2010-03-07 11:09:02 -08:00
graph.h
grep.c Merge branch 'rs/threaded-grep-context' 2010-04-03 12:28:39 -07:00
grep.h Merge branch 'ml/color-grep' 2010-03-20 11:29:36 -07:00
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c http-backend: Don't infinite loop during die() 2010-03-24 14:40:56 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'rc/maint-curl-helper' 2010-05-08 22:37:24 -07:00
http.h Merge branch 'rc/maint-curl-helper' 2010-05-08 22:37:24 -07:00
ident.c
imap-send.c Merge branch 'rr/imap-send-unconfuse-from-line' 2010-04-03 12:28:42 -07:00
INSTALL
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c ll_merge(): add ancestor label parameter for diff3-style output 2010-03-20 20:36:11 -07:00
ll-merge.h ll_merge(): add ancestor label parameter for diff3-style output 2010-03-20 20:36:11 -07:00
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'sr/remote-helper-export' 2010-05-21 04:02:15 -07:00
match-trees.c
merge-file.c merge_file(): add comment explaining behavior wrt conflict style 2010-03-20 20:36:11 -07:00
merge-recursive.c Merge branch 'pc/remove-warn' 2010-05-08 22:32:59 -07:00
merge-recursive.h merge: make function try_merge_command non static 2010-04-01 11:14:10 -07:00
name-hash.c
notes-cache.c introduce notes-cache interface 2010-04-01 23:58:30 -07:00
notes-cache.h introduce notes-cache interface 2010-04-01 23:58:30 -07:00
notes.c Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
notes.h notes.h: declare bit field as unsigned to silence compiler complaints 2010-04-06 21:55:50 -07:00
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options.c parse-options: add parse_options_concat() to concat options 2010-03-06 23:58:33 -08:00
parse-options.h parse-options: add parse_options_concat() to concat options 2010-03-06 23:58:33 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'mm/mkstemps-mode-for-packfiles' into maint 2010-03-08 00:36:00 -08:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'eb/unpretty-b-format' 2010-05-08 22:36:40 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jc/maint-refs-dangling' into maint 2010-03-31 15:09:32 -07:00
refs.h Support showing notes from more than one notes tree 2010-03-12 21:55:39 -08:00
RelNotes Start 1.7.2 cycle 2010-05-08 22:58:36 -07:00
remote-curl.c Merge branch 'rc/maint-curl-helper' 2010-05-08 22:37:24 -07:00
remote.c
remote.h
replace_object.c
rerere.c ll_merge(): add ancestor label parameter for diff3-style output 2010-03-20 20:36:11 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
revision.h Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
run-command.c start_command: close cmd->err descriptor when fork/spawn fails 2010-05-20 16:11:29 -07:00
run-command.h Merge branch 'sp/maint-push-sideband' into maint 2010-03-02 22:54:50 -08:00
send-pack.h
server-info.c
setup.c Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM 2010-04-04 15:55:29 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'maint' 2010-05-18 22:39:56 -07:00
sha1_name.c
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
string-list.c string-list: add unsorted_string_list_lookup() 2010-03-24 19:41:19 -07:00
string-list.h string-list: add unsorted_string_list_lookup() 2010-03-24 19:41:19 -07:00
submodule.c Teach diff --submodule and status to handle .git files in submodules 2010-04-10 11:51:56 -07:00
submodule.h git status: ignoring untracked files must apply to submodules too 2010-03-13 21:56:35 -08:00
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-safe xmalloc and xrealloc needs a recursive mutex 2010-04-08 23:06:39 -07:00
thread-utils.h Thread-safe xmalloc and xrealloc needs a recursive mutex 2010-04-08 23:06:39 -07:00
trace.c
transport-helper.c remote-helpers: add support for an export command 2010-03-31 21:40:11 -07:00
transport.c Merge branch 'tc/transport-verbosity' 2010-03-15 00:58:42 -07:00
transport.h Merge branch 'tc/transport-verbosity' 2010-03-15 00:58:42 -07:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c Introduce remove_or_warn function 2010-03-28 09:53:04 -07:00
unpack-trees.h
upload-pack.c
usage.c
userdiff.c diff: cache textconv output 2010-04-02 00:05:31 -07:00
userdiff.h diff: cache textconv output 2010-04-02 00:05:31 -07:00
utf8.c Merge branch 'rs/optim-text-wrap' into maint 2010-03-04 22:26:33 -08:00
utf8.h Merge branch 'rs/optim-text-wrap' into maint 2010-03-04 22:26:33 -08:00
walker.c
walker.h
wrap-for-bin.sh wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR 2010-03-02 16:27:03 -08:00
wrapper.c Merge branch 'np/malloc-threading' 2010-05-21 04:02:16 -07:00
write_or_die.c
ws.c whitespace: add tab-in-indent support for --whitespace=fix 2010-04-04 14:21:54 -07:00
wt-status.c wt-status: fix 'fprintf' compilation warning 2010-05-01 22:05:14 -07:00
wt-status.h wt-status: collect ignored files 2010-04-10 00:43:59 -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

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

	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.