1
0
mirror of https://github.com/git/git.git synced 2024-11-18 17:13:55 +01:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Junio C Hamano 3b37d9c17e Merge branch 'sb/notes-parse-opt'
* sb/notes-parse-opt:
  notes: rework subcommands and parse options

Conflicts:
	builtin/notes.c
2010-03-28 21:52:28 -07:00
block-sha1
builtin Merge branch 'sb/notes-parse-opt' 2010-03-28 21:52:28 -07:00
compat Merge branch 'fn/maint-mkdtemp-compat' into maint 2010-03-08 00:36:02 -08:00
contrib Fix a spelling mistake in a git-p4 console message 2010-03-20 09:18:48 -07:00
Documentation Merge branch 'maint' 2010-03-28 21:52:18 -07:00
git_remote_helpers
git-gui
gitk-git
gitweb Merge branch 'jn/gitweb-config-error-die' into maint 2010-03-04 22:27:12 -08:00
perl git-svn: support fetch with autocrlf on 2010-03-05 02:57:57 -08:00
ppc
t Merge branch 'sb/notes-parse-opt' 2010-03-28 21:52:28 -07:00
templates
xdiff
.gitattributes
.gitignore
.mailmap .mailmap: Map the the first submissions of MJG by e-mail 2010-03-21 16:30:17 -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.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
branch.h
builtin.h notes: implement helpers needed for note copying during rewrite 2010-03-12 21:55:39 -08:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c Merge branch 'jc/color-attrs' into maint 2010-03-24 16:24:13 -07:00
color.h Merge branch 'jc/color-attrs' into maint 2010-03-24 16:24:13 -07:00
combine-diff.c
command-list.txt
commit.c
commit.h
config.c
config.mak.in
configure.ac
connect.c Merge branch 'fl/askpass' 2010-03-20 11:29:35 -07:00
convert.c
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c daemon: parse_host_and_port SIGSEGV if port is specified 2010-03-20 08:49:31 -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 'jl/submodule-diff-dirtiness' 2010-03-24 16:25:43 -07:00
diff.h git status: ignoring untracked files must apply to submodules too 2010-03-13 21:56:35 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
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
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
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh Make difftool.prompt fall back to mergetool.prompt 2010-01-22 15:57:45 -08:00
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-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 -i: make post-rewrite work for 'edit' 2010-03-28 21:34:40 -07:00
git-rebase.sh Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
git-relink.perl
git-repack.sh
git-request-pull.sh
git-send-email.perl send-email: add --no-cc, --no-to, and --no-bcc 2010-03-08 15:55:42 -08:00
git-sh-setup.sh Merge branch 'gb/maint-submodule-env' into maint 2010-03-08 00:36:02 -08:00
git-stash.sh stash: suggest the correct command line for unknown options. 2010-03-06 20:00:42 -08:00
git-submodule.sh Merge branch 'jh/maint-submodule-status-in-void' 2010-03-24 16:55:37 -07:00
git-svn.perl Merge branch 'fl/askpass' 2010-03-20 11:29:35 -07:00
GIT-VERSION-GEN Git 1.7.0.3 2010-03-21 17:01:22 -07:00
git-web--browse.sh
git.c Merge branch 'jh/notes' 2010-03-15 00:52:06 -07:00
git.spec.in
graph.c Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_* 2010-03-07 11:09:02 -08:00
graph.h
grep.c Merge branch 'ml/color-grep' 2010-03-20 11:29:36 -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-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c imap-send: suppress warning about cleartext password with CRAM-MD5 2010-03-28 09:24:25 -07:00
INSTALL
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'maint' 2010-03-20 11:29:19 -07:00
match-trees.c
merge-file.c
merge-recursive.c
merge-recursive.h
name-hash.c
notes.c Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
notes.h notes: track whether notes_trees were changed at all 2010-03-12 21:55:40 -08: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.h
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 Support showing notes from more than one notes tree 2010-03-12 21:55:39 -08: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 'tr/notes-display' 2010-03-24 16:26:43 -07:00
refs.h Support showing notes from more than one notes tree 2010-03-12 21:55:39 -08:00
RelNotes Prepare for 1.7.0.4 2010-03-28 21:32:25 -07:00
remote-curl.c Merge branch 'tc/http-cleanup' 2010-03-15 00:58:50 -07:00
remote.c
remote.h
replace_object.c
rerere.c
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 Merge branch 'mw/maint-gcc-warns-unused-write' into maint 2010-03-08 00:36:02 -08:00
run-command.h
send-pack.h
server-info.c
setup.c Merge branch 'nd/root-git' 2010-03-07 12:47:15 -08:00
sha1_file.c Merge branch 'mm/mkstemps-mode-for-packfiles' into maint 2010-03-08 00:36:00 -08:00
sha1_name.c
sha1-lookup.c
sha1-lookup.h
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.h
submodule.c git status: ignoring untracked files must apply to submodules too 2010-03-13 21:56:35 -08: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.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-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
transport-helper.c Merge branch 'tc/transport-verbosity' 2010-03-15 00:58:42 -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
unpack-trees.h
upload-pack.c
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'jl/submodule-diff-dirtiness' 2010-03-24 16:25:43 -07:00
wt-status.h git status: Show detailed dirty status of submodules in long format 2010-03-08 15:49:23 -08:00
xdiff-interface.c
xdiff-interface.h

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

	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.