1
0
mirror of https://github.com/git/git.git synced 2024-10-21 19:58:11 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Jim Meyering 90dce51584 use xstrdup, not strdup in ll-merge.c
Otherwise, a fluky allocation failure would cause merge
configuration settings to be silently ignored.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-14 13:37:14 -07:00
arm
compat compat/mingw.c: Teach mingw_rename() to replace read-only files 2008-11-23 19:26:42 -08:00
contrib Fix bash completion in path with spaces 2009-03-30 09:07:03 -07:00
Documentation git-rerere.txt: grammatical fixups and cleanups 2009-06-13 12:44:41 -07:00
git-gui Merge branch 'maint' of git://repo.or.cz/git-gui into maint 2008-11-01 22:31:14 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2008-08-16 23:21:07 -07:00
gitweb GIT 1.6.0.6 2008-12-19 19:27:35 -08:00
mozilla-sha1
perl Git.pm: call Error::Simple() properly 2009-01-13 22:52:35 -08:00
ppc
t diff -c -p: do not die on submodules 2009-04-29 12:49:52 -07:00
templates Fix permission bits on sources checked out with an overtight umask 2008-09-09 13:32:32 -07:00
xdiff xdiff: give up scanning similar lines early 2008-12-02 23:45:37 -08:00
.gitattributes
.gitignore
.mailmap
abspath.c
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c git-archive: work in bare repos 2008-10-26 16:19:59 -07:00
archive.h
attr.c
attr.h
base85.c
blob.c
blob.h
branch.c Fix "checkout --track -b newbranch" on detached HEAD 2008-10-17 14:35:06 -07:00
branch.h
builtin-add.c
builtin-annotate.c
builtin-apply.c apply: fix access to an uninitialized mode variable, found by valgrind 2009-02-03 22:04:31 -08:00
builtin-archive.c git-archive: work in bare repos 2008-10-26 16:19:59 -07:00
builtin-blame.c builtin-blame: Fix blame -C -C with submodules. 2008-10-05 23:49:55 -07:00
builtin-branch.c Fix git branch -m for symrefs. 2008-10-26 14:42:57 -07:00
builtin-bundle.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-cat-file.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-check-attr.c
builtin-check-ref-format.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-checkout-index.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-checkout.c git checkout: don't warn about unborn branch if -f is already passed 2008-11-27 18:35:28 -08:00
builtin-clean.c
builtin-clone.c builtin-clone: fix typo 2008-09-19 22:05:31 -07:00
builtin-commit-tree.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-commit.c commit: abort commit if interactive add failed 2009-04-05 00:37:32 -07:00
builtin-config.c Use git_pathdup instead of xstrdup(git_path(...)) 2008-10-30 17:52:24 -07:00
builtin-count-objects.c
builtin-describe.c
builtin-diff-files.c diff/diff-files: do not use --cc too aggressively 2008-09-18 10:49:03 -07:00
builtin-diff-index.c diff*: fix worktree setup 2008-08-28 20:50:10 -07:00
builtin-diff-tree.c
builtin-diff.c "git diff <tree>{3,}": do not reverse order of arguments 2008-12-07 14:57:57 -08:00
builtin-fast-export.c fast-export: ensure we traverse commits in topological order 2009-02-11 18:30:17 -08:00
builtin-fetch--tool.c
builtin-fetch-pack.c fetch-pack: Avoid memcpy() with src==dst 2008-12-07 02:41:45 -08:00
builtin-fetch.c Fix fetch/pull when run without --update-head-ok 2008-10-13 10:46:03 -07:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c Use strchrnul() instead of strchr() plus manual workaround 2008-09-29 08:56:26 -07:00
builtin-fsck.c builtin-fsck: fix off by one head count 2009-01-17 22:37:41 -08:00
builtin-gc.c builtin-gc.c: use new pack_keep bitfield to detect .keep file existence 2008-11-12 10:28:14 -08:00
builtin-grep.c grep: pass -I (ignore binary) down to external grep 2009-02-02 10:58:20 -08:00
builtin-http-fetch.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-init-db.c init: Do not segfault on big GIT_TEMPLATE_DIR environment variable 2009-04-18 13:06:40 -07:00
builtin-log.c git-show: do not segfault when showing a bad tag 2008-12-15 01:29:44 -08:00
builtin-ls-files.c Teach ls-files --with-tree=<tree> to work with options other than -c 2008-11-16 00:15:50 -08:00
builtin-ls-remote.c git ls-remote: make usage string match manpage 2008-11-11 13:24:00 -08:00
builtin-ls-tree.c Add output flushing before fork() 2008-08-04 21:46:42 -07:00
builtin-mailinfo.c mailinfo: 'From:' header should be unfold as well 2009-01-12 15:22:11 -08:00
builtin-mailsplit.c
builtin-merge-base.c merge-base: die with an error message if not passed a commit ref 2008-07-28 23:02:12 -07:00
builtin-merge-file.c
builtin-merge-ours.c
builtin-merge-recursive.c Use remove_path from dir.c instead of own implementation 2008-09-29 08:37:07 -07:00
builtin-merge.c builtin-merge: fix a typo in an error message 2009-04-27 09:36:14 -07:00
builtin-mv.c builtin-mv.c: check for unversionned files before looking at the destination. 2009-02-04 11:07:42 -08:00
builtin-name-rev.c Merge branch 'maint' 2008-08-03 14:14:10 -07:00
builtin-pack-objects.c process_{tree,blob}: Remove useless xstrdup calls 2009-04-12 14:30:31 -07:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c builtin-prune.c: prune temporary packs in <object_dir>/pack directory 2008-09-23 01:53:07 -07:00
builtin-push.c git-push.txt: Describe --repo option in more detail 2008-10-08 07:15:53 -07:00
builtin-read-tree.c checkout: Fix "initial checkout" detection 2008-11-12 14:16:50 -08:00
builtin-reflog.c Use git_pathdup instead of xstrdup(git_path(...)) 2008-10-30 17:52:24 -07:00
builtin-remote.c Fix non-literal format in printf-style calls 2008-11-11 14:43:59 -08:00
builtin-rerere.c
builtin-reset.c Fix git branch -m for symrefs. 2008-10-26 14:42:57 -07:00
builtin-rev-list.c Start conforming code to "git subcmd" style part 3 2008-09-15 23:11:35 -07:00
builtin-rev-parse.c rev-parse: Add support for the ^! and ^@ syntax 2008-07-27 14:14:01 -07:00
builtin-revert.c Merge branch 'ar/maint-mksnpath' into maint 2008-11-08 16:13:19 -08:00
builtin-rm.c git rm: refresh index before up-to-date check 2008-10-08 07:04:44 -07:00
builtin-send-pack.c Merge branch 'cb/maint-update-ref-fix' into maint 2008-11-08 17:32:49 -08:00
builtin-shortlog.c
builtin-show-branch.c
builtin-show-ref.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c tag: delete TAG_EDITMSG only on successful tag 2008-12-07 02:53:45 -08:00
builtin-tar-tree.c Cosmetical command name fix 2008-09-15 23:11:35 -07:00
builtin-unpack-objects.c Start conforming code to "git subcmd" style part 3 2008-09-15 23:11:35 -07:00
builtin-update-index.c Start conforming code to "git subcmd" style part 3 2008-09-15 23:11:35 -07:00
builtin-update-ref.c Fix git update-ref --no-deref -d. 2008-10-26 14:44:25 -07:00
builtin-upload-archive.c
builtin-verify-pack.c discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
builtin-verify-tag.c builtin-verify-tag: fix -v option parsing 2008-07-28 23:02:11 -07:00
builtin-write-tree.c
builtin.h
bundle.c Fix non-literal format in printf-style calls 2008-11-11 14:43:59 -08:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Clear the delta base cache during fast-import checkpoint 2009-02-10 15:30:59 -08:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c diff -c -p: do not die on submodules 2009-04-29 12:49:52 -07:00
command-list.txt
commit.c sort_in_topological_order(): avoid setting a commit flag 2008-08-01 23:14:22 -07:00
commit.h pretty=format: respect date format options 2008-08-29 00:14:29 -07:00
config.c Fix buffer overflow in config parser 2009-04-17 20:59:01 -07:00
config.mak.in
configure.ac
connect.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
convert.c
copy.c
COPYING
csum-file.c fix pread()'s short read in index-pack 2008-10-10 07:09:30 -07:00
csum-file.h fix pread()'s short read in index-pack 2008-10-10 07:09:30 -07:00
ctype.c ctype.c: protect tiny C preprocessor constants 2008-08-27 16:14:22 -07:00
daemon.c git-daemon: SysV needs the signal handler reinstated. 2008-08-12 15:41:08 -07:00
date.c date/time: do not get confused by fractional seconds 2008-11-13 09:06:58 -08:00
decorate.c decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
decorate.h decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c diff.c: output correct index lines for a split diff 2009-01-27 00:48:00 -08:00
diff.h diff --cumulative is a sub-option of --dirstat 2008-09-03 22:37:03 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Add file delete/create info when we overflow rename_limit 2008-10-28 08:58:42 -07:00
diffcore.h Add reference for status letters in documentation. 2008-11-02 15:57:10 -08:00
dir.c dir.c: Fix two minor grammatical errors in comments 2009-05-05 22:04:16 -07:00
dir.h Add remove_path: a function to remove as much as possible of a path 2008-09-29 08:37:07 -07:00
editor.c
entry.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
environment.c Fix non-literal format in printf-style calls 2008-11-11 14:43:59 -08:00
exec_cmd.c Refactor, adding prepare_git_cmd(const char **argv) 2008-07-28 23:02:11 -07:00
exec_cmd.h Refactor, adding prepare_git_cmd(const char **argv) 2008-07-28 23:02:11 -07:00
fast-import.c Clear the delta base cache during fast-import checkpoint 2009-02-10 15:30:59 -08:00
fetch-pack.h
fixup-builtins
fsck.c Fix non-literal format in printf-style calls 2008-11-11 14:43:59 -08:00
fsck.h
generate-cmdlist.sh generate-cmdlist.sh: avoid selecting synopsis at wrong place 2008-11-30 18:16:32 -08:00
git-add--interactive.perl add -p: warn if only binary changes present 2008-10-26 16:20:24 -07:00
git-am.sh git-am: ignore --binary option 2008-08-16 02:32:36 -07:00
git-archimport.perl
git-bisect.sh bisect: fix another instance of eval'ed string 2009-02-27 14:30:34 -08:00
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl Merge branch 'maint' 2008-08-05 21:21:08 -07:00
git-cvsserver.perl
git-filter-branch.sh filter-branch: be more helpful when an annotated tag changes 2008-08-08 16:19:51 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool.sh git-mergetool: properly handle "git mergetool -- filename" 2008-12-19 19:10:58 -08:00
git-parse-remote.sh
git-pull.sh pull: allow "git pull origin $something:$current_branch" into an unborn branch 2008-10-17 11:26:20 -07:00
git-quiltimport.sh
git-rebase--interactive.sh Avoid spurious error messages on error mistakes. 2009-01-13 00:21:31 -08:00
git-rebase.sh Teach rebase -i to honor pre-rebase hook 2008-10-06 01:19:14 -07:00
git-relink.perl
git-repack.sh git-repack: use non-dashed update-server-info 2009-04-05 00:08:49 -07:00
git-request-pull.sh request-pull: make usage string match manpage 2008-11-17 02:27:18 -08:00
git-send-email.perl git-send-email: handle email address with quoted comma 2008-12-19 19:10:48 -08:00
git-sh-setup.sh
git-stash.sh git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1) 2008-10-09 09:09:50 -07:00
git-submodule.sh git-submodule: Avoid printing a spurious message. 2008-11-11 13:48:04 -08:00
git-svn.perl git-svn: Make following parents atomic 2008-12-08 16:29:34 -08:00
GIT-VERSION-GEN GIT 1.6.0.2 2008-09-12 16:18:47 -07:00
git-web--browse.sh
git.c maint: check return of split_cmdline to avoid bad config strings 2008-09-24 08:58:14 -07:00
git.spec.in Fixed broken git help -w when installing from RPM 2009-02-04 22:00:49 -08:00
graph.c
graph.h
grep.c grep: fix segfault when "git grep '('" is given 2009-04-27 17:28:18 -07:00
grep.h log --author/--committer: really match only with name part 2008-09-04 22:21:56 -07:00
hash-object.c
hash.c
hash.h
help.c Fix 'git help help' 2008-08-21 22:18:21 -07:00
http-push.c http-push.c::remove_locks(): fix use after free 2009-05-24 11:08:31 -07:00
http-walker.c
http.c http.c: use 'git_config_string' to get 'curl_http_proxy' 2008-12-07 02:41:55 -08:00
http.h
ident.c Replace uses of "git-var" with "git var" 2008-07-30 11:42:01 -07:00
imap-send.c
index-pack.c rehabilitate 'git index-pack' inside the object store 2008-10-21 13:20:03 -07:00
INSTALL Fix typos in INSTALL 2008-08-04 21:52:08 -07:00
interpolate.c
interpolate.h
list-objects.c process_{tree,blob}: Remove useless xstrdup calls 2009-04-08 22:58:43 -07:00
list-objects.h
ll-merge.c use xstrdup, not strdup in ll-merge.c 2009-06-14 13:37:14 -07:00
ll-merge.h
lockfile.c Enhance hold_lock_file_for_{update,append}() API 2008-10-19 12:35:37 -07:00
log-tree.c format-patch: Produce better output with --inline or --attach 2008-07-29 23:18:15 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile add test-dump-cache-tree in Makefile 2009-02-03 22:11:44 -08:00
match-trees.c
merge-file.c
merge-index.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
merge-recursive.h
merge-tree.c
mktag.c
mktree.c
name-hash.c
object.c
object.h
pack-check.c
pack-redundant.c
pack-refs.c Enhance hold_lock_file_for_{update,append}() API 2008-10-19 12:35:37 -07:00
pack-refs.h
pack-revindex.c discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-revindex.h discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-write.c Do not perform cross-directory renames when creating packs 2008-09-22 12:19:14 -07:00
pack.h improve reliability of fixup_pack_header_footer() 2008-08-29 21:51:27 -07:00
pager.c pager: do not dup2 stderr if it is already redirected 2008-12-15 01:37:15 -08:00
parse-options.c Sync with 1.5.6.5 2008-08-06 13:50:48 -07:00
parse-options.h Sync with 1.5.6.5 2008-08-06 13:50:48 -07:00
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path.c Fix non-literal format in printf-style calls 2008-11-11 14:43:59 -08:00
pkt-line.c
pkt-line.h
pretty.c pretty=format: respect date format options 2008-08-29 00:14:29 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c process_{tree,blob}: Remove useless xstrdup calls 2009-04-08 22:58:43 -07:00
reachable.h
read-cache.c checkout: Fix "initial checkout" detection 2008-11-12 14:16:50 -08:00
README README: tutorial.txt is now called gittutorial.txt 2009-01-06 22:12:07 -08:00
receive-pack.c Fix git branch -m for symrefs. 2008-10-26 14:42:57 -07:00
reflog-walk.c
reflog-walk.h
refs.c Fix non-literal format in printf-style calls 2008-11-11 14:43:59 -08:00
refs.h
RelNotes GIT 1.6.0.6 2008-12-19 19:27:35 -08:00
remote.c git push: Interpret $GIT_DIR/branches in a Cogito compatible way 2008-11-11 15:26:40 -08:00
remote.h
rerere.c Merge branch 'ar/maint-mksnpath' into maint 2008-11-08 16:13:19 -08:00
rerere.h
revision.c revision.c: use proper data type in call to sizeof() within xrealloc 2008-11-14 21:41:19 -08:00
revision.h Fix "git log -i --grep" 2008-08-24 23:28:02 -07:00
run-command.c Add output flushing before fork() 2008-08-04 21:46:42 -07:00
run-command.h
send-pack.h
server-info.c Use git_pathdup instead of xstrdup(git_path(...)) 2008-10-30 17:52:24 -07:00
setup.c make prefix_path() never return NULL 2008-10-06 00:37:30 -07:00
sha1_file.c close_sha1_file(): make it easier to diagnose errors 2009-03-24 14:39:20 -07:00
sha1_name.c get_sha1_basic(): fix invalid memory access, found by valgrind 2009-01-27 15:16:31 -08:00
sha1-lookup.c
sha1-lookup.h
shallow.c
shell.c shell: do not play duplicated definition games to shrink the executable 2008-08-29 22:38:41 -07:00
shortlog.h
show-index.c
sideband.c improve handling of sideband message display 2008-09-03 14:51:10 -07:00
sideband.h
strbuf.c
strbuf.h
string-list.c
string-list.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c Add --verbose|-v to test-chmtime 2008-10-31 00:19:52 -07:00
test-date.c
test-delta.c
test-dump-cache-tree.c add test-dump-cache-tree in Makefile 2009-02-03 22:11:44 -08:00
test-genrandom.c test-genrandom: Add newline to usage string 2009-04-23 01:29:00 -07:00
test-match-trees.c
test-parse-options.c test-parse-options: use appropriate cast in length_callback 2008-08-13 18:11:44 -07:00
test-path-utils.c test-path-utils: Fix off by one, found by valgrind 2009-01-27 15:16:41 -08:00
test-sha1.c
test-sha1.sh
thread-utils.c
thread-utils.h
trace.c
transport.c Fix fetch/clone --quiet when stdout is connected 2008-10-06 00:01:07 -07:00
transport.h
tree-diff.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c
unpack-trees.c merge: fix out-of-bounds memory access 2009-01-31 10:39:55 -08:00
unpack-trees.h checkout: do not lose staged removal 2008-09-09 22:55:22 -07:00
update-server-info.c
upload-pack.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
usage.c
utf8.c
utf8.h
var.c Replace uses of "git-var" with "git var" 2008-07-30 11:42:01 -07:00
walker.c
walker.h
wrapper.c
write_or_die.c
ws.c
wt-status.c refactor handling of "other" files in ls-files and status 2008-10-17 12:46:59 -07:00
wt-status.h
xdiff-interface.c xdiff-interface.c: strip newline (and cr) from line before pattern matching 2008-10-16 08:31:56 -07:00
xdiff-interface.h diff.c: associate a flag with each pattern and use it for compiling regex 2008-09-18 20:06:23 -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 "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.

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.