1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 06:17:56 +01:00
Find a file
Junio C Hamano 829f03e98c Merge branch 'mh/verify-lock-error-report'
Bring consistency to error reporting mechanism used in "refs" API.

* mh/verify-lock-error-report:
  ref_transaction_commit(): do not capitalize error messages
  verify_lock(): do not capitalize error messages
  verify_lock(): report errors via a strbuf
  verify_lock(): on errors, let the caller unlock the lock
  verify_lock(): return 0/-1 rather than struct ref_lock *
2015-06-11 09:29:54 -07:00
block-sha1
builtin Merge branch 'jk/clone-dissociate' 2015-06-11 09:29:52 -07:00
compat Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
contrib Merge branch 'sg/complete-decorate-full-not-long' into maint 2015-05-26 13:49:22 -07:00
Documentation Merge branch 'jk/color-diff-plain-is-context' 2015-06-11 09:29:53 -07:00
ewah ewah: add convenient wrapper ewah_serialize_strbuf() 2015-03-12 13:45:16 -07:00
git-gui git-gui 0.20.0 2015-04-18 18:35:48 -07:00
gitk-git Merge branch 'master' of git://ozlabs.org/~paulus/gitk 2015-03-24 16:10:37 -07:00
gitweb
mergetools mergetools: add winmerge as a builtin tool 2015-05-20 13:13:44 -07:00
perl Merge branch 'ew/svn-maint-fixes' into maint 2015-03-06 14:57:55 -08:00
po git-gui: sv.po: Update Swedish translation (547t0f0u) 2015-04-18 12:03:50 +01:00
ppc
t Merge branch 'mh/verify-lock-error-report' 2015-06-11 09:29:54 -07:00
templates Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
vcs-svn
xdiff
.gitattributes
.gitignore t7063: tests for untracked cache 2015-03-12 13:45:18 -07:00
.mailmap Update mailmap to spell out "Alexander Kuleshov" 2015-03-27 12:58:18 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
archive.c Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
archive.h
argv-array.c
argv-array.h
attr.c Merge branch 'pt/xdg-config-path' into maint 2015-06-05 12:00:04 -07:00
attr.h
base85.c
bisect.c register_ref(): rewrite to take an object_id argument 2015-05-25 12:19:28 -07:00
bisect.h
blob.c
blob.h
branch.c ref_transaction_update(): remove "have_old" parameter 2015-02-17 11:22:50 -08:00
branch.h
builtin.h
bulk-checkin.c Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
bulk-checkin.h
bundle.c bundle.c: fix memory leak 2015-03-10 20:53:52 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'pt/xdg-config-path' into maint 2015-06-05 12:00:04 -07:00
check-builtins.sh check-builtins: strip executable suffix $X when enumerating builtins 2015-02-05 12:03:27 -08:00
check-racy.c
check_bindir
color.c parse_color: fix return value for numeric color values 0-8 2015-01-20 15:56:03 -08:00
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/color-diff-plain-is-context' 2015-06-11 09:29:53 -07:00
command-list.txt command-list.txt: drop the "common" tag 2015-05-21 13:03:37 -07:00
commit-slab.h
commit.c commit: convert parts to struct object_id 2015-03-13 22:43:13 -07:00
commit.h Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
config.c Merge branch 'pt/xdg-config-path' into maint 2015-06-05 12:00:04 -07:00
config.mak.in
config.mak.uname strbuf_getwholeline: use getdelim if it is available 2015-04-16 08:15:05 -07:00
configure.ac configure: support HAVE_BSD_SYSCTL option 2015-03-10 15:13:25 -07:00
connect.c Merge branch 'bc/connect-plink' into maint 2015-06-05 12:00:11 -07:00
connect.h
connected.c
connected.h
convert.c filter_buffer_or_fd(): ignore EPIPE 2015-05-20 10:19:12 -07:00
convert.h
copy.c copy.c: make copy_fd() report its status silently 2015-05-19 14:48:54 -07:00
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c Merge branch 'pt/xdg-config-path' into maint 2015-06-05 12:00:04 -07:00
credential.c
credential.h
csum-file.c sha1fd_check: die when we cannot open the file 2015-03-19 13:35:15 -07:00
csum-file.h
ctype.c kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
daemon.c Merge branch 'jc/daemon-no-ipv6-for-2.4.1' 2015-05-11 14:23:53 -07:00
date.c Merge branch 'jc/epochtime-wo-tz' into maint-2.3 2015-05-11 14:33:58 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'nd/diff-i-t-a' 2015-05-19 13:17:49 -07:00
diff-no-index.c diff-no-index: align D/F handling with that of normal Git 2015-03-26 14:08:43 -07:00
diff.c Merge branch 'jk/color-diff-plain-is-context' 2015-06-11 09:29:53 -07:00
diff.h Merge branch 'jk/color-diff-plain-is-context' 2015-06-11 09:29:53 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'jk/diffcore-rename-duplicate' into maint 2015-03-13 22:56:08 -07:00
diffcore.h
dir.c Merge branch 'jc/gitignore-precedence' into maint 2015-06-05 12:00:13 -07:00
dir.h Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
editor.c
entry.c
environment.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
exec_cmd.c Merge branch 'jk/git-no-more-argv0-path-munging' into maint 2015-05-26 13:49:18 -07:00
exec_cmd.h
fast-import.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
fetch-pack.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.perl generate-cmdlist: parse common group commands 2015-05-21 13:03:37 -07:00
gettext.c gettext.c: move get_preferred_languages() from http.c 2015-02-26 14:09:20 -08:00
gettext.h Merge branch 'ye/http-accept-language' 2015-03-06 15:02:25 -08:00
git-add--interactive.perl Merge branch 'ak/add-i-empty-candidates' into maint 2015-02-24 22:10:42 -08:00
git-am.sh Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl merge: deprecate 'git merge <message> HEAD <commit>' syntax 2015-04-29 13:28:10 -07:00
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: avoid passing commit message through sed 2015-04-29 10:01:04 -07:00
git-instaweb.sh git-instaweb: use @SHELL_PATH@ instead of /bin/sh 2015-03-10 15:10:35 -07:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool--lib: set IFS for difftool and mergetool 2015-05-20 13:13:42 -07:00
git-mergetool.sh mergetool--lib: set IFS for difftool and mergetool 2015-05-20 13:13:42 -07:00
git-p4.py Merge branch 'ld/p4-editor-multi-words' 2015-06-05 12:17:38 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'pt/pull-log-n' into maint 2015-06-05 12:00:24 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'mm/rebase-i-post-rewrite-exec' 2015-06-01 12:45:20 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'jk/rebase-quiet-noop' into maint 2015-05-26 13:49:23 -07:00
git-relink.perl
git-remote-testgit.sh transport-helper: do not request symbolic refs to remote helpers 2015-01-21 22:46:59 -08:00
git-request-pull.sh
git-send-email.perl Merge branch 'km/send-email-getopt-long-workarounds' 2015-03-03 14:37:03 -08:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
git-stash.sh Merge branch 'jk/stash-options' 2015-06-01 12:45:14 -07:00
git-submodule.sh Merge branch 'ps/submodule-sanitize-path-upon-add' into maint 2015-03-05 13:13:10 -08:00
git-svn.perl git-svn: lazy load some modules 2015-02-26 20:19:21 +00:00
GIT-VERSION-GEN Git 2.4.3 2015-06-05 12:22:33 -07:00
git-web--browse.sh
git.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'jk/blame-commit-label' into maint 2015-02-24 22:09:54 -08:00
grep.h
hashmap.c
hashmap.h
help.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
help.h
hex.c define utility functions for object IDs 2015-03-13 22:43:11 -07:00
http-backend.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
http-fetch.c
http-push.c Merge branch 'sb/leaks' 2015-03-27 13:02:32 -07:00
http-walker.c
http.c Merge branch 'ls/http-ssl-cipher-list' 2015-05-22 12:41:45 -07:00
http.h
ident.c
imap-send.c imap-send: use cURL automatically when NO_OPENSSL defined 2015-03-10 15:19:05 -07:00
INSTALL
khash.h
kwset.c kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
kwset.h kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c Merge branch 'jk/color-diff-plain-is-context' 2015-06-11 09:29:53 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c Merge branch 'jc/ignore-epipe-in-filter' 2015-05-22 12:41:57 -07:00
lockfile.h lockfile: allow file locking to be retried with a timeout 2015-05-14 14:51:08 -07:00
log-tree.c add_ref_decoration(): convert local variable original_sha1 to object_id 2015-05-25 12:19:34 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'jk/skip-http-tests-under-no-curl' into maint 2015-06-05 12:00:28 -07:00
match-trees.c
merge-blobs.c merge-blobs.c: fix a memleak 2015-03-23 11:12:58 -07:00
merge-blobs.h
merge-recursive.c use file_exists() to check if a file exists in the worktree 2015-05-20 13:49:10 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c string_list_add_one_ref(): rewrite to take an object_id argument 2015-05-25 12:19:34 -07:00
notes.h
object.c Merge branch 'jk/type-from-string-gently' into maint 2015-05-13 14:05:54 -07:00
object.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint 2015-06-05 12:00:22 -07:00
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c Merge branch 'jk/decimal-width-for-uintmax' into maint 2015-03-05 13:12:59 -08:00
parse-options-cb.c
parse-options.c
parse-options.h Merge branch 'iu/fix-parse-options-h-comment' into maint 2015-04-21 12:12:20 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'pt/xdg-config-path' into maint 2015-06-05 12:00:04 -07:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'rs/simple-cleanups' into maint 2015-03-06 14:57:57 -08:00
prio-queue.c
prio-queue.h
progress.c progress: treat "no terminal" as being in the foreground 2015-05-19 09:35:14 -07:00
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c add_one_ref(): rewrite to take an object_id argument 2015-05-25 12:19:34 -07:00
reachable.h
read-cache.c Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'mh/verify-lock-error-report' 2015-06-11 09:29:54 -07:00
refs.h each_ref_fn_adapter(): remove adapter 2015-05-25 12:19:39 -07:00
RelNotes Git 2.4.3 2015-06-05 12:22:33 -07:00
remote-curl.c Merge branch 'rs/deflate-init-cleanup' into maint 2015-03-23 11:23:38 -07:00
remote-testsvn.c
remote.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
remote.h remote.c: add branch_get_push 2015-05-22 09:33:08 -07:00
replace_object.c register_replace_ref(): rewrite to take an object_id argument 2015-05-25 12:19:35 -07:00
rerere.c Merge branch 'jk/rerere-forget-check-enabled' into maint 2015-06-05 12:00:25 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jk/still-interesting' into maint 2015-05-26 13:49:26 -07:00
revision.h Merge branch 'jc/unused-symbols' 2015-02-11 13:44:07 -08:00
run-command.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
run-command.h Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
send-pack.c Merge branch 'bc/object-id' 2015-05-05 21:00:23 -07:00
send-pack.h
sequencer.c Merge branch 'mg/sequencer-commit-messages-always-verbatim' 2015-03-17 16:01:32 -07:00
sequencer.h
server-info.c add_info_ref(): rewrite to take an object_id argument 2015-05-25 12:19:35 -07:00
setup.c Merge branch 'nd/dwim-wildcards-as-pathspecs' 2015-05-19 13:17:58 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint 2015-06-05 12:00:07 -07:00
sha1_name.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
shallow.c shallow: rewrite functions to take object_id arguments 2015-05-25 12:19:36 -07:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c ewah: add convenient wrapper ewah_serialize_strbuf() 2015-03-12 13:45:16 -07:00
split-index.h
strbuf.c strbuf_getwholeline: use getdelim if it is available 2015-04-16 08:15:05 -07:00
strbuf.h strbuf_addch: avoid calling strbuf_grow 2015-04-16 08:15:05 -07:00
streaming.c Merge branch 'sb/plug-streaming-leak' 2015-04-14 11:49:09 -07:00
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-config.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-dump-split-index.c
test-dump-untracked-cache.c untracked cache: guard and disable on system changes 2015-03-12 13:45:18 -07:00
test-genrandom.c
test-hashmap.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1-array.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c thread-utils.c: detect CPU count on older BSD-like systems 2015-03-10 15:13:28 -07:00
thread-utils.h
trace.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
trace.h
trailer.c trailer: use capture_command 2015-03-22 21:39:18 -07:00
trailer.h
transport-helper.c Merge branch 'jc/push-cert' into maint 2015-03-05 13:12:58 -08:00
transport.c write_one_ref(): rewrite to take an object_id argument 2015-05-25 12:19:36 -07:00
transport.h
tree-diff.c diff: convert struct combine_diff_path to object_id 2015-03-13 22:43:13 -07:00
tree-walk.c tree-walk: learn get_tree_entry_follow_symlinks 2015-05-20 13:45:49 -07:00
tree-walk.h tree-walk: learn get_tree_entry_follow_symlinks 2015-05-20 13:45:49 -07:00
tree.c
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c untracked cache: invalidate at index addition or removal 2015-03-12 13:45:16 -07:00
unpack-trees.h
update_unicode.sh
upload-pack.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c do not include the same header twice 2015-02-13 13:16:12 -08:00
userdiff.h
utf8.c utf8-bom: introduce skip_utf8_bom() helper 2015-04-16 11:35:06 -07:00
utf8.h utf8-bom: introduce skip_utf8_bom() helper 2015-04-16 11:35:06 -07:00
varint.c
varint.h
version.c
version.h
versioncmp.c versionsort: support reorder prerelease suffixes 2015-02-27 13:38:22 -08:00
walker.c mark_complete(): rewrite to take an object_id argument 2015-05-25 12:19:37 -07:00
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'jk/at-push-sha1' 2015-06-05 12:17:36 -07:00
wt-status.h wt-status: refactor detached HEAD analysis 2015-03-06 11:52:35 -08:00
xdiff-interface.c
xdiff-interface.h
zlib.c zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw} 2015-03-05 15:46:03 -08: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 version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/giteveryday.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://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.