mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-12 20:23:02 +01:00
Code Activity
Mirror of https://github.com/git/git
15841 commits 6 branches 956 tags 508 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Miklos Vajna 18668f5319 builtin-merge: avoid run_command_v_opt() for recursive and subtree 
The try_merge_strategy() function always ran the strategy in a separate
process, though this is not always necessary. The recursive and subtree
strategy can be called without a fork(). This patch adds a check, and
calls recursive in the same process without wasting resources.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-30 20:47:11 -07:00
arm
compat Merge branch 'maint' 2008-08-21 01:54:49 -07:00
contrib git-p4: Fix checkout bug when using --import-local. 2008-08-29 00:15:47 -07:00
Documentation Merge branch 'maint' 2008-08-30 20:31:39 -07:00
git-gui Merge git-gui 0.11.0 2008-08-17 11:41:19 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2008-08-16 23:21:07 -07:00
gitweb
mozilla-sha1
perl Git.pm: Make File::Spec and File::Temp requirement lazy 2008-08-16 02:58:22 -07:00
ppc
t Merge branch 'maint' 2008-08-30 20:31:39 -07:00
templates templates/Makefile: install is unnecessary, just use mkdir -p 2008-08-22 00:21:59 -07:00
xdiff
.gitattributes
.gitignore Update .gitignore to ignore git-help 2008-08-13 23:46:03 -07:00
.mailmap
abspath.c
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c pretty=format: respect date format options 2008-08-29 00:14:29 -07:00
archive.h
attr.c
attr.h
base85.c
blob.c
blob.h
branch.c
branch.h
builtin-add.c Merge branch 'jc/add-addremove' 2008-08-27 16:39:57 -07:00
builtin-annotate.c
builtin-apply.c git-apply: Loosen "match_beginning" logic 2008-08-30 13:23:02 -07:00
builtin-archive.c
builtin-blame.c xdiff-interface: hide the whole "xdiff_emit_state" business from the caller 2008-08-14 00:30:26 -07:00
builtin-branch.c
builtin-bundle.c
builtin-cat-file.c
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-checkout.c merge-recursive: introduce merge_options 2008-08-30 20:46:54 -07:00
builtin-clean.c
builtin-clone.c
builtin-commit-tree.c Fix commit_tree() buffer leak 2008-08-17 16:27:17 -07:00
builtin-commit.c pretty=format: respect date format options 2008-08-29 00:14:29 -07:00
builtin-config.c
builtin-count-objects.c Merge branch 'mg/count-objects' 2008-08-20 23:41:54 -07:00
builtin-describe.c
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c Teach git diff-tree --stdin to diff trees 2008-08-11 01:35:47 -07:00
builtin-diff.c
builtin-fast-export.c Fix a warning (on cygwin) to allow -Werror 2008-08-26 16:22:00 -07:00
builtin-fetch--tool.c
builtin-fetch-pack.c
builtin-fetch.c
builtin-fmt-merge-msg.c
builtin-for-each-ref.c for-each-ref: Allow a trailing slash in the patterns 2008-08-29 00:14:06 -07:00
builtin-fsck.c
builtin-gc.c
builtin-grep.c
builtin-help.c Make main_cmds and other_cmds local to builtin-help.c 2008-08-28 21:51:04 -07:00
builtin-http-fetch.c
builtin-init-db.c
builtin-log.c format-patch: use default diff format even with patch options 2008-08-26 17:08:13 -07:00
builtin-ls-files.c
builtin-ls-remote.c
builtin-ls-tree.c
builtin-mailinfo.c mailinfo: avoid violating strbuf assertion 2008-08-19 19:36:56 -07:00
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c
builtin-merge-ours.c
builtin-merge-recursive.c merge-recursive: introduce merge_options 2008-08-30 20:46:54 -07:00
builtin-merge.c builtin-merge: avoid run_command_v_opt() for recursive and subtree 2008-08-30 20:47:11 -07:00
builtin-mv.c
builtin-name-rev.c
builtin-pack-objects.c Merge branch 'sp/missing-thin-base' into maint 2008-08-30 08:38:19 -07:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c
builtin-push.c Make push more verbose about illegal combination of options 2008-08-17 00:24:21 -07:00
builtin-read-tree.c
builtin-reflog.c builtin-reflog: Allow reflog expire to name partial ref 2008-08-17 16:24:46 -07:00
builtin-remote.c
builtin-rerere.c
builtin-reset.c
builtin-rev-list.c Fix "git log -i --grep" 2008-08-24 23:28:02 -07:00
builtin-rev-parse.c
builtin-revert.c Make cherry-pick use rerere for conflict resolution. 2008-08-11 16:42:49 -07:00
builtin-rm.c builtin-rm: Add a --force flag 2008-08-08 18:27:19 -07:00
builtin-send-pack.c
builtin-shortlog.c
builtin-show-branch.c
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c
builtin-tar-tree.c
builtin-unpack-objects.c
builtin-update-index.c
builtin-update-ref.c
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-write-tree.c
builtin.h Revert "Build-in "git-shell"" 2008-08-25 22:39:17 -07:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jc/add-addremove' 2008-08-27 16:39:57 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c Merge branch 'maint' to sync with 1.6.0.1 2008-08-24 14:50:44 -07:00
command-list.txt
commit.c
commit.h Merge branch 'maint' 2008-08-29 00:16:39 -07:00
config.c
config.mak.in config.mak.in: Pass on LDFLAGS from configure 2008-08-21 23:16:57 -07:00
configure.ac
connect.c
convert.c
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c dir.c: Avoid c99 array initialization 2008-08-28 21:49:51 -07:00
daemon.c daemon.c: minor style fixup 2008-08-25 22:49:49 -07:00
date.c
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 Merge branch 'maint' 2008-08-29 00:16:39 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c dir.c: Avoid c99 array initialization 2008-08-28 21:49:51 -07:00
dir.h
dump-cache-tree.c
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh git-am: ignore --binary option 2008-08-16 02:32:36 -07:00
git-archimport.perl
git-bisect.sh Merge branch 'maint' 2008-08-11 19:24:28 -07:00
git-compat-util.h dir.c: Avoid c99 array initialization 2008-08-28 21:49:51 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-filter-branch.sh filter-branch: Grok special characters in tag names 2008-08-21 23:39:13 -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-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--interactive.sh rebase -i -p: fix parent rewriting 2008-08-13 15:17:10 -07:00
git-rebase.sh Improve error output of git-rebase 2008-08-16 23:21:18 -07:00
git-relink.perl
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-setup.sh
git-stash.sh git-stash: improve synopsis in help and manual page 2008-08-16 02:58:18 -07:00
git-submodule.sh Merge branch 'ml/submodule' 2008-08-27 17:16:30 -07:00
git-svn.perl git-svn: fix dcommit to urls with embedded usernames 2008-08-20 23:48:07 -07:00
GIT-VERSION-GEN GIT 1.6.0 2008-08-17 11:42:10 -07:00
git-web--browse.sh
git.c Revert "Build-in "git-shell"" 2008-08-25 22:39:17 -07:00
git.spec.in
graph.c
graph.h
grep.c
grep.h
hash-object.c
hash.c
hash.h
help.c list_commands: only call git_exec_path if it is needed 2008-08-28 21:51:34 -07:00
help.h Remove calculation of the longest command name from where it is not used 2008-08-28 21:49:55 -07:00
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c
index-pack.c index-pack: setup git repository 2008-08-26 16:25:48 -07:00
INSTALL
interpolate.c
interpolate.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Teach git log --exit-code to return an appropriate exit code 2008-08-17 16:26:26 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Split out merge_recursive() to merge-recursive.c 2008-08-30 20:46:54 -07:00
match-trees.c
merge-file.c
merge-index.c
merge-recursive.c merge-recursive: introduce merge_options 2008-08-30 20:46:54 -07:00
merge-recursive.h merge-recursive: introduce merge_options 2008-08-30 20:46:54 -07:00
merge-tree.c
mktag.c
mktree.c
name-hash.c
object.c
object.h
pack-check.c
pack-redundant.c
pack-refs.c
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 index-pack: be careful after fixing up the header/footer 2008-08-27 13:33:56 -07:00
pack.h
pager.c
parse-options.c
parse-options.h
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path.c Fix typo in comments of longest_ancestor_length() 2008-08-11 16:44:54 -07: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
reachable.h
read-cache.c Merge branch 'jc/add-addremove' 2008-08-27 16:39:57 -07:00
README
receive-pack.c
reflog-walk.c
reflog-walk.h
refs.c
refs.h
RelNotes Start 1.6.1 cycle 2008-08-17 16:20:31 -07:00
remote.c remote.c: add a function for deleting a refspec array and use it (twice) 2008-08-22 00:15:37 -07:00
remote.h remote.c: add a function for deleting a refspec array and use it (twice) 2008-08-22 00:15:37 -07:00
rerere.c
rerere.h
revision.c Fix "git log -i --grep" 2008-08-24 23:28:02 -07:00
revision.h Fix "git log -i --grep" 2008-08-24 23:28:02 -07:00
run-command.c Merge branch 'jk/pager-swap' 2008-08-19 21:42:55 -07:00
run-command.h
send-pack.h
server-info.c
setup.c
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'np/verify-pack' 2008-08-27 16:39:46 -07:00
sha1_name.c Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}' 2008-08-21 23:30:17 -07:00
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
sideband.h
strbuf.c
strbuf.h
string-list.c
string-list.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
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-sha1.c
test-sha1.sh
thread-utils.c
thread-utils.h
trace.c
transport.c Merge branch 'maint' 2008-08-09 01:40:08 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c
unpack-trees.c unpack_trees(): protect the handcrafted in-core index from read_cache() 2008-08-23 18:09:27 -07:00
unpack-trees.h
update-server-info.c
upload-pack.c
usage.c
utf8.c
utf8.h
var.c
walker.c
walker.h
wrapper.c
write_or_die.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c xdiff-interface: hide the whole "xdiff_emit_state" business from the caller 2008-08-14 00:30:26 -07:00
xdiff-interface.h xdiff-interface: hide the whole "xdiff_emit_state" business from the caller 2008-08-14 00:30:26 -07:00

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/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.

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.