1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00
Find a file
Junio C Hamano b31272f704 blame: compute abbreviation width that ensures uniqueness
Julia Lawall noticed that in linux-next repository the commit object
60d5c9f5 (shown with the default abbreviation width baked into "git
blame") in output from

  $ git blame -L 3675,3675 60d5c9f5b -- \
      drivers/staging/brcm80211/brcmfmac/wl_iw.c

is no longer unique in the repository, which results in "short SHA1
60d5c9f5 is ambiguous".

Compute the minimum abbreviation width that ensures uniqueness when
the user did not specify the --abbrev option to avoid this.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-02 00:54:19 -07:00
block-sha1
builtin blame: compute abbreviation width that ensures uniqueness 2012-07-02 00:54:19 -07:00
compat Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maint 2011-08-01 14:44:13 -07:00
contrib Documentation: use [verse] for SYNOPSIS sections 2011-07-06 14:26:26 -07:00
Documentation Git 1.7.6.6 2012-02-05 23:50:52 -08:00
git-gui
git_remote_helpers
gitk-git
gitweb Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6 2011-10-26 16:12:35 -07:00
perl Add MYMETA.json to perl/.gitignore 2011-12-29 13:08:47 -08:00
po
ppc
t t2203: fix wrong commit command 2012-01-11 00:09:36 -08:00
templates make the sample pre-commit hook script reject names with newlines, too 2011-10-26 14:31:14 -07:00
vcs-svn
xdiff
.gitattributes
.gitignore Makefile: Track changes to LDFLAGS and relink when necessary 2011-06-22 11:56:53 -07:00
.mailmap
abspath.c Merge branch 'js/maint-add-path-stat-pwd' into maint 2011-08-16 11:41:27 -07:00
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c zlib: zlib can only process 4GB at a time 2011-06-10 11:52:15 -07:00
archive.c
archive.h
attr.c attr: fix leak in free_attr_elem 2012-01-11 19:07:23 -08:00
attr.h
base85.c
bisect.c bisect: refactor sha1_array into a generic sha1 list 2011-05-19 20:02:10 -07:00
bisect.h
blob.c
blob.h
branch.c branch.c: use the parsed branch name 2011-08-19 11:01:36 -07:00
branch.h
builtin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'cb/maint-ls-files-error-report' into maint 2011-09-23 14:30:49 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c Merge branch 'jc/maint-combined-diff-work-tree' into maint 2011-08-23 15:27:30 -07:00
command-list.txt
commit.c whitespace: have SP on both sides of an assignment "=" 2011-08-25 14:47:07 -07:00
commit.h Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
config.c Merge branch 'jk/maint-config-param' into maint 2011-09-11 21:53:13 -07:00
config.mak.in Merge branch 'kk/maint-prefix-in-config-mak' into maint 2011-06-01 14:02:39 -07:00
configure.ac
connect.c Merge branch 'dz/connect-error-report' into maint 2011-09-11 21:53:47 -07:00
convert.c
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c date.c: Support iso8601 timezone formats 2011-09-12 16:49:14 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'jc/maint-reset-unmerged-path' into maint 2011-08-16 11:41:28 -07:00
diff-no-index.c
diff.c Merge branch 'jc/zlib-wrap' into maint 2011-08-16 11:23:26 -07:00
diff.h Merge branch 'jk/diff-not-so-quick' 2011-06-06 11:40:14 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diffcore-rename.c: avoid set-but-not-used warning 2011-06-01 13:54:17 -07:00
diffcore.h
dir.c
dir.h
editor.c
entry.c
environment.c read_gitfile_gently(): rename misnamed function to read_gitfile() 2011-08-22 14:04:56 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c zlib: zlib can only process 4GB at a time 2011-06-10 11:52:15 -07:00
fetch-pack.h
fixup-builtins
fsck.c Merge branch 'jm/maint-misc-fix' into maint 2011-05-30 00:09:41 -07:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl add -i: ignore terminal escape sequences 2011-05-17 20:44:17 -07:00
git-am.sh Merge branch 'gb/maint-am-patch-format-error-message' into maint 2011-09-23 14:11:18 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h error_routine: use parent's stderr if exec fails 2011-07-31 18:27:07 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: Export variable `workdir' for --commit-filter 2011-08-08 12:09:38 -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: check return value from read 2011-09-19 17:41:49 -07:00
git-mergetool.sh Merge branch 'jm/mergetool-pathspec' into maint-1.7.6 2011-10-26 16:12:25 -07:00
git-parse-remote.sh
git-pull.sh pull: remove extra space from reflog message 2011-08-01 16:05:44 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh rebase -i -p: include non-first-parent commits in todo list 2011-06-19 14:37:23 -07:00
git-rebase--merge.sh
git-rebase.sh rebase: clarify "restore the original branch" 2011-07-13 22:03:12 -07:00
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh git-sh-i18n.sh: add GIT_GETTEXT_POISON support 2011-05-14 20:29:11 -07:00
git-sh-setup.sh require-work-tree wants more than what its name says 2011-05-24 11:34:40 -07:00
git-stash.sh
git-submodule.sh Merge branch 'jl/submodule-update-quiet' into maint 2011-08-16 12:41:14 -07:00
git-svn.perl git-svn: Correctly handle root commits in mergeinfo ranges 2011-06-28 03:26:11 +00:00
GIT-VERSION-GEN Git 1.7.6.6 2012-02-05 23:50:52 -08:00
git-web--browse.sh
git.c Merge branch 'jk/maint-config-alias-fix' into maint 2011-06-01 14:05:22 -07:00
git.spec.in
graph.c
graph.h
grep.c
grep.h
hash.c
hash.h
help.c help_unknown_cmd: do not propose an "unknown" cmd 2011-07-08 08:59:44 -07:00
help.h
hex.c
http-backend.c zlib: zlib can only process 4GB at a time 2011-06-10 11:52:15 -07:00
http-fetch.c
http-push.c whitespace: have SP on both sides of an assignment "=" 2011-08-25 14:47:07 -07:00
http-walker.c
http.c
http.h Merge branch 'jc/zlib-wrap' into maint 2011-08-16 11:23:26 -07:00
ident.c Merge branch 'rg/no-gecos-in-pwent' 2011-05-26 10:32:19 -07:00
imap-send.c imap-send: remove dead code 2012-02-05 23:44:56 -08:00
INSTALL
levenshtein.c
levenshtein.h
LGPL-2.1 provide a copy of the LGPLv2.1 2011-05-19 18:23:17 -07:00
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
log-tree.h
mailmap.c Merge branch 'ml/mailmap' into maint-1.7.6 2011-12-13 21:12:14 -08:00
mailmap.h
Makefile Makefile: Track changes to LDFLAGS and relink when necessary 2011-06-22 11:56:53 -07:00
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c Merge branch 'jc/rename-degrade-cc-to-c' into maint 2011-05-31 12:00:02 -07:00
merge-recursive.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c notes_merge_commit(): do not pass temporary buffer to other function 2011-09-27 09:58:47 -07:00
notes-merge.h
notes.c Do not use C++-style comments 2011-08-22 10:07:07 -07:00
notes.h
object.c read_sha1_file(): get rid of read_sha1_file_repl() madness 2011-05-15 15:23:33 -07:00
object.h
pack-check.c zlib: zlib can only process 4GB at a time 2011-06-10 11:52:15 -07:00
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 read_gitfile_gently(): rename misnamed function to read_gitfile() 2011-08-22 14:04:56 -07:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
progress.c
progress.h
quote.c ls-files: fix pathspec display on error 2011-08-11 13:04:16 -07:00
quote.h
reachable.c
reachable.h
read-cache.c whitespace: have SP on both sides of an assignment "=" 2011-08-25 14:47:07 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'nd/maint-clone-gitdir' into maint 2011-09-23 14:21:39 -07:00
refs.h Merge branch 'jc/maint-1.7.3-checkout-describe' into maint 2011-08-01 14:43:18 -07:00
RelNotes Prepare for 1.7.6.6 2012-01-10 13:11:03 -08:00
remote-curl.c Revert "Merge branch 'cb/maint-quiet-push' into maint" 2011-09-06 11:10:41 -07:00
remote.c
remote.h
replace_object.c inline lookup_replace_object() calls 2011-05-15 15:23:33 -07:00
rerere.c Merge branch 'maint' 2011-05-30 00:09:55 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/notes-batch-removal' 2011-05-29 23:51:26 -07:00
revision.h Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
run-command.c notice error exit from pager 2011-08-01 16:21:55 -07:00
run-command.h
send-pack.h
server-info.c
setup.c read_gitfile_gently(): rename misnamed function to read_gitfile() 2011-08-22 14:04:56 -07:00
sh-i18n--envsubst.c Merge branch 'ab/i18n-scripts-basic' 2011-06-17 11:40:32 -07:00
sha1-array.c receive-pack: eliminate duplicate .have refs 2011-05-19 20:02:31 -07:00
sha1-array.h receive-pack: eliminate duplicate .have refs 2011-05-19 20:02:31 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jc/maint-clone-alternates' into maint 2011-09-23 14:27:33 -07:00
sha1_name.c Merge branch 'jc/magic-pathspec' 2011-05-23 09:58:35 -07:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c Merge branch 'jk/maint-config-param' into maint 2011-09-11 21:53:13 -07:00
strbuf.h Merge branch 'jk/maint-config-param' into maint 2011-09-11 21:53:13 -07:00
string-list.c
string-list.h
submodule.c Merge branch 'nd/maint-clone-gitdir' into maint 2011-09-23 14:21:39 -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
test-match-trees.c
test-mktemp.c
test-obj-pool.c
test-parse-options.c
test-path-utils.c
test-run-command.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-pool.c
test-subprocess.c
test-svn-fe.c
test-treap.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c Revert "Merge branch 'cb/maint-quiet-push' into maint" 2011-09-06 11:10:41 -07:00
transport.h refactor refs_from_alternate_cb to allow passing extra data 2011-05-19 20:01:10 -07:00
tree-diff.c Merge branch 'jk/diff-not-so-quick' 2011-06-06 11:40:14 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6 2011-10-26 16:09:03 -07:00
unpack-trees.h Merge branch 'jc/diff-index-quick-exit-early' into maint 2011-08-16 11:23:25 -07:00
upload-pack.c get_indexed_object can return NULL if nothing is in that slot; check for it 2011-08-24 10:50:33 -07:00
url.c
url.h
usage.c error_routine: use parent's stderr if exec fails 2011-07-31 18:27:07 -07:00
userdiff.c Merge branch 'jk/combine-diff-binary-etc' into maint 2011-08-16 11:23:24 -07:00
userdiff.h refactor get_textconv to not require diff_filespec 2011-05-23 15:46:02 -07:00
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c read_in_full: always report errors 2011-05-26 13:54:18 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'maint-1.7.5' into maint-1.7.6 2011-10-26 16:08:19 -07:00
wt-status.h
xdiff-interface.c add, merge, diff: do not use strcasecmp to compare config variable names 2011-05-14 18:53:39 -07:00
xdiff-interface.h
zlib.c zlib: allow feeding more than 4GB in one go 2011-06-10 16:17:19 -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.