Go to file
Junio C Hamano 0958a24d73 Merge branch 'jc/sha1-name-more'
Teaches the object name parser things like a "git describe" output
is always a commit object, "A" in "git log A" must be a committish,
and "A" and "B" in "git log A...B" both must be committish, etc., to
prolong the lifetime of abbreviated object names.

* jc/sha1-name-more: (27 commits)
  t1512: match the "other" object names
  t1512: ignore whitespaces in wc -l output
  rev-parse --disambiguate=<prefix>
  rev-parse: A and B in "rev-parse A..B" refer to committish
  reset: the command takes committish
  commit-tree: the command wants a tree and commits
  apply: --build-fake-ancestor expects blobs
  sha1_name.c: add support for disambiguating other types
  revision.c: the "log" family, except for "show", takes committish
  revision.c: allow handle_revision_arg() to take other flags
  sha1_name.c: introduce get_sha1_committish()
  sha1_name.c: teach lookup context to get_sha1_with_context()
  sha1_name.c: many short names can only be committish
  sha1_name.c: get_sha1_1() takes lookup flags
  sha1_name.c: get_describe_name() by definition groks only commits
  sha1_name.c: teach get_short_sha1() a commit-only option
  sha1_name.c: allow get_short_sha1() to take other flags
  get_sha1(): fix error status regression
  sha1_name.c: restructure disambiguation of short names
  sha1_name.c: correct misnamed "canonical" and "res"
  ...
2012-07-22 12:55:07 -07:00
Documentation Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
block-sha1
builtin Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
compat Merge branch 'tb/sanitize-decomposed-utf-8-pathname' 2012-07-13 15:37:51 -07:00
contrib Merge branch 'mm/mediawiki-tests' 2012-07-13 15:37:46 -07:00
git-gui
git_remote_helpers
gitk-git
gitweb
mergetools
perl perl/Makefile: Fix a missing double-quote 2012-06-29 13:04:50 -07:00
po l10n: zh_CN.po: translate 29 new messages 2012-07-06 09:11:15 +08:00
ppc
t Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
templates
vcs-svn Merge branch 'jn/vcs-svn' 2012-07-13 15:37:04 -07:00
xdiff Merge branch 'rs/xdiff-fast-hash-fix' 2012-05-25 12:05:02 -07:00
.gitattributes
.gitignore Merge branch 'jn/makefile-cleanup' 2012-07-15 21:39:17 -07:00
.mailmap
COPYING
GIT-VERSION-GEN Git 1.7.11.2 2012-07-11 12:59:41 -07:00
INSTALL INSTALL: update asciidoc recommendation 2012-05-30 09:07:04 -07:00
LGPL-2.1
Makefile Merge branch 'jn/makefile-cleanup' 2012-07-15 21:39:17 -07:00
README
RelNotes Git 1.7.11.2 2012-07-11 12:59:41 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c archive: ustar header checksum is computed unsigned 2012-06-13 10:47:21 -07:00
archive-zip.c archive-zip: streaming for deflated files 2012-05-03 10:22:57 -07:00
archive.c Merge branch 'rs/archive-tree-in-tip-simplify' 2012-05-23 13:35:22 -07:00
archive.h archive: delegate blob reading to backend 2012-05-03 10:22:56 -07:00
argv-array.c
argv-array.h
attr.c Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes 2012-06-25 09:06:15 -07:00
attr.h
base85.c
bisect.c bisect: copy filename string obtained from git_path() 2012-05-03 13:15:35 -07:00
bisect.h
blob.c
blob.h
branch.c Remove i18n legos in notifying new branch tracking setup 2012-06-07 11:46:02 -07:00
branch.h
builtin.h Merge branch 'jk/diff-no-index-pager' into maint 2012-07-11 12:46:21 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c tweak "bundle verify" of a complete history 2012-06-04 16:24:49 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt Merge branch 'nd/columns' 2012-05-03 15:13:31 -07:00
commit.c Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
commit.h Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint 2012-05-14 11:46:16 -07:00
config.c Merge branch 'tb/sanitize-decomposed-utf-8-pathname' 2012-07-13 15:37:51 -07:00
config.mak.in docs: drop asciidoc7compatible flag 2012-05-30 09:22:43 -07:00
configure.ac docs: drop asciidoc7compatible flag 2012-05-30 09:22:43 -07:00
connect.c Merge branch 'hv/remote-end-hung-up' 2012-07-04 23:40:12 -07:00
connected.c
connected.h
convert.c
convert.h
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c git credential fill: output the whole 'struct credential' 2012-06-25 11:56:24 -07:00
credential.h git credential fill: output the whole 'struct credential' 2012-06-25 11:56:24 -07:00
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c Merge branch 'jc/maint-filter-branch-epoch-date' 2012-07-22 12:55:05 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c Merge branch 'jc/refactor-diff-stdin' 2012-07-13 15:38:05 -07:00
diff.c Merge branch 'jc/refactor-diff-stdin' 2012-07-13 15:38:05 -07:00
diff.h Merge branch 'jc/diff-algo-cleanup' into maint 2012-05-11 11:19:27 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h Merge branch 'jc/refactor-diff-stdin' 2012-07-13 15:38:05 -07:00
dir.c Merge branch 'jc/ls-files-i-dir' into maint 2012-07-11 12:44:35 -07:00
dir.h Merge branch 'jc/ls-files-i-dir' into maint 2012-07-11 12:44:35 -07:00
editor.c
entry.c
environment.c git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.h
fixup-builtins
fmt-merge-msg.h
fsck.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl git-add--interactive.perl: Remove two unused variables 2012-06-25 10:06:09 -07:00
git-am.sh am: don't call mailinfo if $rebasing 2012-06-26 13:17:57 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh Merge branch 'jc/maint-filter-branch-epoch-date' 2012-07-22 12:55:05 -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
git-mergetool.sh
git-p4.py Merge branch 'pw/git-p4-move' 2012-07-15 21:38:32 -07:00
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh rebase: don't source git-sh-setup twice 2012-06-26 13:17:50 -07:00
git-rebase--interactive.sh Merge branch 'cw/rebase-i-root' 2012-07-15 21:38:42 -07:00
git-rebase--merge.sh rebase: don't source git-sh-setup twice 2012-06-26 13:17:50 -07:00
git-rebase.sh Merge branch 'cw/rebase-i-root' 2012-07-15 21:38:42 -07:00
git-relink.perl Consistently use perl from /usr/bin/ for scripts 2012-05-01 13:32:17 -07:00
git-remote-testgit.py
git-repack.sh
git-request-pull.sh request-pull: really favor a matching tag 2012-06-01 12:38:19 -07:00
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh git-sh-setup: define workaround wrappers before they are used 2012-05-16 10:44:04 -07:00
git-stash.sh
git-submodule.sh Merge branch 'js/submodule-relative' 2012-06-28 15:20:55 -07:00
git-svn.perl git-svn: use YAML format for mergeinfo cache when possible 2012-06-10 08:47:53 +00:00
git-web--browse.sh
git.c add 'git credential' plumbing command 2012-06-25 11:55:51 -07:00
git.spec.in
gpg-interface.c ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT 2012-05-24 17:16:41 -07:00
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'rs/maint-grep-F' into maint 2012-06-01 13:01:41 -07:00
grep.h Merge branch 'rs/maint-grep-F' into maint 2012-06-01 13:01:41 -07:00
hash.c
hash.h
help.c move git_version_string into version.c 2012-06-03 13:11:34 -07:00
help.h Merge branch 'nd/columns' 2012-05-03 15:13:31 -07:00
hex.c
http-backend.c
http-fetch.c
http-push.c http-push: do not access git_default_email directly 2012-05-22 09:07:52 -07:00
http-walker.c
http.c http: get default user-agent from git_user_agent 2012-06-03 13:11:54 -07:00
http.h
ident.c Merge branch 'jk/ident-gecos-strbuf' 2012-05-29 13:09:13 -07:00
imap-send.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
kwset.c
kwset.h
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
ll-merge.h
lockfile.c
log-tree.c format-patch: refactor get_patch_filename 2012-05-22 09:08:50 -07:00
log-tree.h format-patch: refactor get_patch_filename 2012-05-22 09:08:50 -07:00
mailmap.c
mailmap.h
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c Merge branch 'jc/diff-algo-cleanup' into maint 2012-05-11 11:19:27 -07:00
merge-recursive.h
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c notes-merge: remove i18n legos in merge result message 2012-06-07 11:58:09 -07:00
notes-merge.h
notes.c
notes.h
object.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
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-cb.c
parse-options.c git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
parse-options.h i18n: parseopt: lookup help and argument translations when showing usage 2012-05-08 10:46:13 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c config: read (but not write) from $XDG_CONFIG_HOME/git/config file 2012-06-25 09:05:55 -07:00
pkt-line.c remove the impression of unexpectedness when access is denied 2012-06-19 13:37:02 -07:00
pkt-line.h remove the impression of unexpectedness when access is denied 2012-06-19 13:37:02 -07:00
preload-index.c
pretty.c Merge branch 'jk/pretty-commit-header-incomplete-line' into maint 2012-06-01 13:01:33 -07:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'tg/maint-cache-name-compare' 2012-07-15 21:40:18 -07:00
reflog-walk.c Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint 2012-05-14 11:46:16 -07:00
reflog-walk.h Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint 2012-05-14 11:46:16 -07:00
refs.c Merge branch 'rs/refs-string-slice' 2012-05-29 13:09:02 -07:00
refs.h
remote-curl.c Merge branch 'jk/maint-push-progress' into maint 2012-05-10 10:08:54 -07:00
remote.c Merge branch 'jk/push-delete-ref-error-message' 2012-07-13 21:22:12 -07:00
remote.h add sorting infrastructure for list refs 2012-05-22 13:31:03 -07:00
replace_object.c
rerere.c Merge branch 'ar/clone-honor-umask-at-top' 2012-07-15 21:39:04 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
revision.h Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
run-command.c
run-command.h
send-pack.h
sequencer.c Merge branch 'nh/empty-rebase' 2012-06-01 13:28:19 -07:00
sequencer.h
server-info.c
setup.c Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'hv/submodule-alt-odb' 2012-05-23 13:35:06 -07:00
sha1_name.c Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .." 2012-05-18 14:21:19 -07:00
streaming.h streaming: void pointer instead of char pointer 2012-05-03 10:22:56 -07:00
string-list.c
string-list.h
submodule.c Merge branch 'hv/submodule-alt-odb' 2012-05-23 13:35:06 -07:00
submodule.h
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 vcs-svn: drop no-op reset methods 2012-07-05 23:26:51 -05:00
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-subprocess.c
test-svn-fe.c vcs-svn: drop no-op reset methods 2012-07-05 23:26:51 -05:00
thread-utils.c
thread-utils.h
trace.c
transport-helper.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
transport.c Merge branch 'ct/advise-push-default' into maint 2012-05-11 11:18:43 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jc/ls-files-i-dir' into maint 2012-07-11 12:44:35 -07:00
unpack-trees.h unpack-trees.c: use path_excluded() in check_ok_to_remove() 2012-06-05 22:21:42 -07:00
upload-pack.c
url.c
url.h
usage.c
userdiff.c
userdiff.h
utf8.c git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
utf8.h git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
varint.c
varint.h
version.c version: add git_user_agent function 2012-06-03 13:11:52 -07:00
version.h version: add git_user_agent function 2012-06-03 13:11:52 -07:00
walker.c
walker.h
wrap-for-bin.sh
wrapper.c ident: report passwd errors with a more friendly message 2012-05-22 09:08:20 -07:00
write_or_die.c
ws.c
wt-status.c status: better advices when splitting a commit (during rebase -i) 2012-06-14 10:15:20 -07:00
wt-status.h wt-status.*: better advices for git status added 2012-06-14 10:15:19 -07:00
xdiff-interface.c xdiff: remove emit_func() and xdi_diff_hunks() 2012-05-09 14:08:42 -07:00
xdiff-interface.h xdiff: remove emit_func() and xdi_diff_hunks() 2012-05-09 14:08:42 -07:00
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.
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 (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://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.