1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-16 06:03:44 +01:00
Find a file
Shawn O. Pearce 76db9dec81 Merge branch 'master' into sp/gfi
git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it.  This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.

This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).

Conflicts:

	git-compat-util.h
2007-01-30 11:07:24 -05:00
arm
compat Replacing the system call pread() with lseek()/xread()/lseek() sequence. 2007-01-09 16:40:40 -08:00
contrib blameview: Use git-cat-file to read the file content. 2007-01-30 02:32:28 -08:00
Documentation git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
gitweb [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
mozilla-sha1
perl [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
ppc
t Merge branch 'master' into sp/gfi 2007-01-30 11:07:24 -05:00
templates Heavily expanded update hook to send more useful emails than the old hook 2007-01-28 14:38:11 -08:00
xdiff Fix yet another subtle xdl_merge() bug 2006-12-30 18:05:05 -08:00
.gitignore Merge branch 'master' into sp/gfi 2007-01-30 11:07:24 -05:00
.mailmap .mailmap: fix screw-ups in Uwe's name 2007-01-22 16:25:15 -08:00
alloc.c
archive-tar.c Set default "tar" umask to 002 and owner.group to root.root 2007-01-06 10:37:14 -08:00
archive-zip.c
archive.h
base85.c
blob.c
blob.h
builtin-add.c Make a short-and-sweet "git-add -i" synonym for "git-add --interactive" 2007-01-17 10:52:36 -08:00
builtin-annotate.c
builtin-apply.c apply --cached: fix crash in subdirectory 2007-01-20 19:05:20 -08:00
builtin-archive.c Make sure git_connect() always give two file descriptors. 2007-01-21 21:51:01 -08:00
builtin-blame.c git-blame: somewhat better commenting. 2007-01-29 19:41:21 -08:00
builtin-branch.c Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
builtin-cat-file.c
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-commit-tree.c Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
builtin-config.c [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
builtin-count-objects.c count-objects -v: show number of packs as well. 2006-12-27 01:05:00 -08:00
builtin-describe.c Compute accurate distances in git-describe before output. 2007-01-28 02:08:51 -08:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-stages.c
builtin-diff-tree.c
builtin-diff.c
builtin-fmt-merge-msg.c
builtin-for-each-ref.c Teach for-each-ref about a little language called Tcl. 2007-01-28 13:00:26 -08:00
builtin-fsck.c Make fsck and fsck-objects be builtins. 2007-01-29 09:36:21 -08:00
builtin-grep.c short i/o: fix calls to read to use xread or read_in_full 2007-01-08 15:44:47 -08:00
builtin-init-db.c Allow default core.logallrefupdates to be overridden with template's config 2007-01-24 17:33:25 -08:00
builtin-log.c Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
builtin-ls-files.c
builtin-ls-tree.c
builtin-mailinfo.c -u is now default for 'git-mailinfo'. 2007-01-09 21:32:49 -08:00
builtin-mailsplit.c
builtin-merge-file.c
builtin-mv.c
builtin-name-rev.c
builtin-pack-objects.c Use fixed-size integers for .idx file I/O 2007-01-18 14:11:50 -08:00
builtin-pack-refs.c Fix seriously broken "git pack-refs" 2007-01-25 19:16:07 -08:00
builtin-prune-packed.c prune-packed: add -q to usage 2007-01-18 14:30:05 -08:00
builtin-prune.c Revert "prune: --grace=time" 2007-01-21 21:29:57 -08:00
builtin-push.c rename --exec to --receive-pack for push and send-pack 2007-01-19 17:54:33 -08:00
builtin-read-tree.c
builtin-reflog.c reflog gc: a tag that does not point at a commit is not a crime. 2007-01-22 21:39:03 -08:00
builtin-rerere.c short i/o: fix calls to write to use xwrite or write_in_full 2007-01-08 15:44:47 -08:00
builtin-rev-list.c
builtin-rev-parse.c
builtin-rm.c git-rm documentation: remove broken behaviour from the example. 2007-01-16 11:50:29 -08:00
builtin-runstatus.c
builtin-shortlog.c
builtin-show-branch.c show-branch -g: default to HEAD 2007-01-25 22:31:10 -08:00
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c Fix git-fetch while on detached HEAD not to give needlessly alarming errors 2007-01-15 15:35:07 -08:00
builtin-tar-tree.c short i/o: fix calls to write to use xwrite or write_in_full 2007-01-08 15:44:47 -08:00
builtin-unpack-objects.c
builtin-update-index.c
builtin-update-ref.c lock_any_ref_for_update(): do not accept malformatted refs. 2007-01-29 00:57:07 -08:00
builtin-upload-archive.c short i/o: fix calls to read to use xread or read_in_full 2007-01-08 15:44:47 -08:00
builtin-verify-pack.c Load core configuration in git-verify-pack. 2006-12-29 11:36:45 -08:00
builtin-write-tree.c
builtin.h Make fsck and fsck-objects be builtins. 2007-01-29 09:36:21 -08:00
cache-tree.c
cache-tree.h
cache.h Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c
commit.c Use log output encoding in --pretty=email headers. 2007-01-13 10:10:20 -08:00
commit.h is_repository_shallow(): prototype fix. 2007-01-21 22:22:23 -08:00
config.c config_set_multivar(): disallow newlines in keys 2007-01-19 17:55:14 -08:00
config.mak.in
configure.ac
connect.c Make sure git_connect() always give two file descriptors. 2007-01-21 21:51:01 -08:00
convert-objects.c
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c git-push through git protocol 2007-01-28 12:31:56 -08:00
date.c show_date(): fix relative dates 2007-01-20 18:57:47 -08:00
delta.h
diff-delta.c
diff-lib.c diff-index --cached --raw: show tree entry on the LHS for unmerged entries. 2007-01-06 22:57:42 -08:00
diff.c short i/o: fix calls to write to use xwrite or write_in_full 2007-01-08 15:44:47 -08:00
diff.h diff-index --cached --raw: show tree entry on the LHS for unmerged entries. 2007-01-06 22:57:42 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diffcore-pickaxe: fix infinite loop on zero-length needle 2007-01-25 21:17:19 -08:00
diffcore-rename.c
diffcore.h diff-index --cached --raw: show tree entry on the LHS for unmerged entries. 2007-01-06 22:57:42 -08:00
dir.c short i/o: fix calls to read to use xread or read_in_full 2007-01-08 15:44:47 -08:00
dir.h Fix 'git add' with .gitignore 2006-12-29 11:01:31 -08:00
dump-cache-tree.c
entry.c short i/o: fix calls to write to use xwrite or write_in_full 2007-01-08 15:44:47 -08:00
environment.c Introduce is_bare_repository() and core.bare configuration variable 2007-01-07 21:36:35 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'master' into sp/gfi 2007-01-30 11:07:24 -05:00
fetch-pack.c Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
fetch.c
fetch.h
generate-cmdlist.sh use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
git-add--interactive.perl
git-am.sh Merge branch 'jc/bare' 2007-01-11 16:50:36 -08:00
git-applymbox.sh -u is now default for 'git-mailinfo'. 2007-01-09 21:32:49 -08:00
git-applypatch.sh
git-archimport.perl use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
git-bisect.sh
git-checkout.sh fix suggested branch creation command when detaching head 2007-01-26 22:38:00 -08:00
git-clean.sh Disallow working directory commands in a bare repository. 2007-01-10 15:03:09 -08:00
git-clone.sh Replace perl code with pure shell code 2007-01-29 01:05:01 -08:00
git-commit.sh git-commit -s: no extra space when sign-offs appear at the end already. 2007-01-29 01:06:27 -08:00
git-compat-util.h Use inttypes.h rather than stdint.h. 2007-01-26 00:03:23 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: activate -a option, really. 2007-01-22 12:20:14 -08:00
git-cvsserver.perl [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-fetch.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-gc.sh git-gc: do not run git-prune by default. 2007-01-21 23:28:28 -08:00
git-instaweb.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-lost-found.sh git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
git-ls-remote.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-ours.sh
git-merge-resolve.sh
git-merge-stupid.sh
git-merge.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-p4import.py [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-parse-remote.sh git-fetch: Allow fetching the remote HEAD 2007-01-30 02:30:25 -08:00
git-pull.sh git-pull: disallow implicit merging to detached HEAD 2007-01-15 15:37:22 -08:00
git-quiltimport.sh Replace "echo -n" with printf in shell scripts. 2007-01-15 22:23:21 -08:00
git-rebase.sh git-rebase: allow rebasing a detached HEAD. 2007-01-20 21:31:00 -08:00
git-relink.perl
git-remote.perl [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-repack.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-request-pull.sh
git-reset.sh Shell syntax fix in git-reset 2007-01-18 14:22:24 -08:00
git-resolve.sh
git-revert.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-send-email.perl git-send-email: remove debugging output. 2007-01-30 02:30:25 -08:00
git-sh-setup.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-svn.perl [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
git-svnimport.perl use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
git-tag.sh Allow the tag signing key to be specified in the config file 2007-01-27 13:46:59 -08:00
git-verify-tag.sh git-verify-tag: make sure we remove temporary file. 2007-01-03 12:34:20 -08:00
GIT-VERSION-GEN GIT v1.5.0-rc2 2007-01-20 23:44:55 -08:00
git.c Make fsck and fsck-objects be builtins. 2007-01-29 09:36:21 -08:00
git.spec.in
gitk [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
grep.c
grep.h
hash-object.c
help.c
http-fetch.c git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
http-push.c Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
http.c
http.h Work around http-fetch built with cURL 7.16.0 2006-12-27 16:44:30 -08:00
ident.c [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
imap-send.c short i/o: fix calls to write to use xwrite or write_in_full 2007-01-08 15:44:47 -08:00
index-pack.c index-pack: write-or-die instead of unchecked write-in-full. 2007-01-11 13:19:31 -08:00
INSTALL use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
interpolate.c
interpolate.h
list-objects.c
list-objects.h
local-fetch.c Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
lockfile.c Print a more accurate error message when we fail to create a lock file. 2007-01-06 10:42:49 -08:00
log-tree.c git-log -g --pretty=oneline should display the reflog message 2007-01-28 01:54:42 -08:00
log-tree.h
Makefile Merge branch 'master' into sp/gfi 2007-01-30 11:07:24 -05:00
merge-base.c
merge-file.c
merge-index.c
merge-recursive.c Convert output messages in merge-recursive to past tense. 2007-01-14 12:20:39 -08:00
merge-tree.c
mktag.c
mktree.c
object-refs.c
object.c
object.h
pack-check.c pack-check.c::verify_packfile(): don't run SHA-1 update on huge data 2007-01-04 22:17:59 -08:00
pack-redundant.c
pack.h Refactor the pack header reading function out of receive-pack.c 2007-01-24 18:08:02 -08:00
pager.c
patch-delta.c
patch-id.c
path-list.c
path-list.h
path.c Merge branch 'jc/detached-head' 2007-01-11 16:47:34 -08:00
peek-remote.c rename --exec to --upload-pack for fetch-pack and peek-remote 2007-01-24 16:12:15 -08:00
pkt-line.c
pkt-line.h
quote.c Teach for-each-ref about a little language called Tcl. 2007-01-28 13:00:26 -08:00
quote.h Teach for-each-ref about a little language called Tcl. 2007-01-28 13:00:26 -08:00
reachable.c Sanitize for_each_reflog_ent() 2007-01-09 03:04:04 -08:00
reachable.h Move traversal of reachable objects into a separate library. 2007-01-06 22:57:34 -08:00
read-cache.c write-cache: do not leak the serialized cache-tree data. 2007-01-11 12:25:16 -08:00
README sanitize content of README file 2007-01-17 12:03:50 -08:00
receive-pack.c Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
reflog-walk.c git-log -g --pretty=oneline should display the reflog message 2007-01-28 01:54:42 -08:00
reflog-walk.h Fix --walk-reflog with --pretty=oneline 2007-01-20 21:32:31 -08:00
refs.c lock_any_ref_for_update(): do not accept malformatted refs. 2007-01-29 00:57:07 -08:00
refs.h Extend read_ref_at() to be usable from places other than sha1_name. 2007-01-19 17:57:53 -08:00
revision.c reflog inspection: introduce shortcut "-g" 2007-01-24 15:13:47 -08:00
revision.h Teach the revision walker to walk by reflogs with --walk-reflogs 2007-01-20 21:32:31 -08:00
rsh.c
rsh.h
run-command.c Use /dev/null for update hook stdin. 2006-12-30 22:22:14 -08:00
run-command.h Use /dev/null for update hook stdin. 2006-12-30 22:22:14 -08:00
send-pack.c Add a missing fork() error check. 2007-01-30 02:30:25 -08:00
server-info.c
setup.c Do not verify filenames in a bare repository 2007-01-20 19:10:26 -08:00
sha1_file.c Refactor the pack header reading function out of receive-pack.c 2007-01-24 18:08:02 -08:00
sha1_name.c Extend read_ref_at() to be usable from places other than sha1_name. 2007-01-19 17:57:53 -08:00
shallow.c is_repository_shallow(): prototype fix. 2007-01-21 22:22:23 -08:00
shell.c
show-index.c
sideband.c
sideband.h
ssh-fetch.c Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
ssh-pull.c
ssh-push.c
ssh-upload.c short i/o: fix calls to write to use xwrite or write_in_full 2007-01-08 15:44:47 -08:00
strbuf.c
strbuf.h
tag.c
tag.h
tar.h
test-date.c
test-delta.c short i/o: fix calls to write to use xwrite or write_in_full 2007-01-08 15:44:47 -08:00
test-sha1.c
test-sha1.sh
trace.c short i/o: clean up the naming for the write_{in,or}_xxx family 2007-01-08 15:44:47 -08:00
tree-diff.c
tree-walk.c get_tree_entry: map blank requested entry to tree root 2007-01-09 14:08:41 -08:00
tree-walk.h
tree.c
tree.h
unpack-file.c short i/o: fix calls to write to use xwrite or write_in_full 2007-01-08 15:44:47 -08:00
unpack-trees.c
unpack-trees.h
update-server-info.c
upload-pack.c shallow repository: disable unsupported operations for now. 2007-01-21 22:23:58 -08:00
usage.c
utf8.c commit-tree: cope with different ways "utf-8" can be spelled. 2006-12-30 15:58:43 -08:00
utf8.h commit-tree: cope with different ways "utf-8" can be spelled. 2006-12-30 15:58:43 -08:00
var.c Don't force everybody to call setup_ident(). 2007-01-28 01:58:50 -08:00
write_or_die.c write_in_full: size_t is unsigned. 2007-01-26 17:39:03 -08:00
wt-status.c wt-status: Actually accept `color.status.BLAH' configuration variables. 2007-01-28 11:04:44 -08:00
wt-status.h Provide better feedback for the untracked only case in status output 2007-01-10 14:29:21 -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/tutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands,
and "man git-commandname" for documentation of each command.
CVS users may also want to read Documentation/cvs-migration.txt.

Many Git online resources are accessible from http://git.or.cz/
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.