mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 18:23:01 +01:00
Code Activity
Mirror of https://github.com/git/git
14782 commits 6 branches 956 tags 506 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Patrick Higgins 641dba49bf Remove the use of '--' in merge program invocation 
Put a "./" at the beginning of all paths given to the merge program so
that filenames beginning with a '-' character don't get interpreted as
options.

This deals with a problem where kdiff3 can be compiled with or without
support for the '--' separator between options and filenames.

Signed-off-by: Patrick Higgins <patrick.higgins@cexp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-19 14:13:55 -07:00
arm
compat compat/fopen.c: avoid clobbering the system defined fopen macro 2008-05-08 17:43:01 -07:00
contrib completion: add more 'git add' options 2008-06-14 12:47:44 -07:00
Documentation GIT 1.5.6 2008-06-18 13:09:43 -07:00
git-gui Merge git://repo.or.cz/git-gui 2008-05-26 19:10:43 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2008-06-11 16:22:53 -07:00
gitweb gitweb: remove unused parse_ref method 2008-06-17 16:39:18 -07:00
mozilla-sha1
perl Git.pm: fix return value of config method 2008-06-01 22:28:27 -07:00
ppc
t clean up error conventions of remote.c:match_explicit 2008-06-18 12:39:13 -07:00
templates Fix prepare-commit-msg hook and replace in-place sed 2008-05-21 09:45:53 -07:00
xdiff
.gitattributes
.gitignore
.mailmap
alias.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
alloc.c
archive-tar.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
archive-zip.c
archive.c
archive.h
attr.c Ignore .gitattributes in bare repositories 2008-06-09 15:08:26 -07:00
attr.h
base85.c
blob.c
blob.h
branch.c Allow tracking branches to set up rebase by default. 2008-05-12 17:16:40 -07:00
branch.h
builtin-add.c git add: add long equivalents of '-u' and '-f' options 2008-06-14 12:47:31 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-archive.c
builtin-blame.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-branch.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-bundle.c
builtin-cat-file.c cat-file --batch / --batch-check: do not exit if hashes are missing 2008-06-09 13:46:08 -07:00
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-checkout.c checkout: "best effort" checkout 2008-05-29 17:35:22 -07:00
builtin-clean.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-clone.c Use nonrelative paths instead of absolute paths for cloned repositories 2008-06-06 11:23:10 -07:00
builtin-commit-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-commit.c commit: drop duplicated parents 2008-06-02 23:55:57 -07:00
builtin-config.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-count-objects.c
builtin-describe.c describe: match pattern for lightweight tags too 2008-06-04 13:08:03 -07:00
builtin-diff-files.c Merge branch 'jc/diff-no-no-index' 2008-05-26 22:38:19 -07:00
builtin-diff-index.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-diff-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-diff.c Merge branch 'jc/diff-no-no-index' 2008-05-26 22:38:19 -07:00
builtin-fast-export.c fast-export: Correctly generate initial commits with no parents 2008-06-12 22:42:20 -07:00
builtin-fetch--tool.c
builtin-fetch-pack.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-fetch.c builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value 2008-05-28 10:47:12 -07:00
builtin-fmt-merge-msg.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-for-each-ref.c
builtin-fsck.c
builtin-gc.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-grep.c
builtin-http-fetch.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-init-db.c git-init: accept --bare option 2008-05-28 18:31:19 -07:00
builtin-log.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-ls-files.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-ls-remote.c
builtin-ls-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-mailinfo.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-mailsplit.c mailsplit: minor clean-up in read_line_with_nul() 2008-05-25 13:23:57 -07:00
builtin-merge-base.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-merge-file.c
builtin-merge-ours.c
builtin-merge-recursive.c Merge branch 'js/merge-recursive' 2008-06-09 16:13:10 -07:00
builtin-mv.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-name-rev.c Merge branch 'maint' 2008-06-06 09:21:48 -07:00
builtin-pack-objects.c Remove now unnecessary 'sync()' calls 2008-05-31 14:49:29 -07:00
builtin-pack-refs.c
builtin-prune-packed.c Remove now unnecessary 'sync()' calls 2008-05-31 14:49:29 -07:00
builtin-prune.c Remove now unnecessary 'sync()' calls 2008-05-31 14:49:29 -07:00
builtin-push.c
builtin-read-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-reflog.c Make git reflog expire honour core.sharedRepository. 2008-06-15 15:54:06 -07:00
builtin-remote.c "remote prune": be quiet when there is nothing to prune 2008-06-11 23:43:25 -07:00
builtin-rerere.c builtin-rerere: fix a small leak 2008-06-17 16:39:59 -07:00
builtin-reset.c git-reset: honor -q and do not show progress message 2008-05-31 18:10:58 -07:00
builtin-rev-list.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-rev-parse.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-revert.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-rm.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-send-pack.c
builtin-shortlog.c
builtin-show-branch.c Merge branch 'maint' 2008-05-26 19:49:01 -07:00
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-tag.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-tar-tree.c
builtin-unpack-objects.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-update-index.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
builtin-update-ref.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-upload-archive.c
builtin-verify-pack.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-verify-tag.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin-write-tree.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
builtin.h Print info about "git help COMMAND" on git's main usage pages 2008-06-06 09:22:18 -07:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h sha1_file.c: simplify parse_pack_index() 2008-06-16 22:19:00 -07:00
check-builtins.sh
check-racy.c
color.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
color.h Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
combine-diff.c
command-list.txt
commit.c Remove unused code in parse_commit_buffer() 2008-06-08 13:46:37 -07:00
commit.h
config.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
config.mak.in
configure.ac Consistency: Use "libcurl" instead of "cURL library" and "curl" 2008-06-15 13:35:10 -07:00
connect.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
convert.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
copy.c
COPYING
csum-file.c Make pack creation always fsync() the result 2008-05-31 14:46:57 -07:00
csum-file.h Make pack creation always fsync() the result 2008-05-31 14:46:57 -07:00
ctype.c
daemon.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
date.c Fix approxidate("never") to always return 0 2008-06-17 16:40:09 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c "git diff": do not ignore index without --no-index 2008-05-24 00:16:39 -07:00
diff-no-index.c git diff --no-index: default to page like other diff frontends 2008-05-26 22:35:07 -07:00
diff.c Merge branch 'maint' 2008-06-16 17:39:50 -07:00
diff.h Merge branch 'jc/diff-no-no-index' 2008-05-26 22:38:19 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'lt/case-insensitive' 2008-05-10 18:14:28 -07:00
dir.h
dump-cache-tree.c
entry.c
environment.c Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Make pack creation always fsync() the result 2008-05-31 14:46:57 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh git-am: head -1 is obsolete and doesn't work on some new systems 2008-06-17 16:40:09 -07:00
git-archimport.perl
git-bisect.sh bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting 2008-05-28 11:47:58 -07:00
git-compat-util.h Port to 12 other Platforms. 2008-06-08 14:27:46 -07:00
git-cvsexportcommit.perl Merge branch 'js/cvsexportcommit' 2008-05-25 13:37:20 -07:00
git-cvsimport.perl git-cvsimport: do not fail when CVSROOT is / 2008-06-10 22:24:01 -07:00
git-cvsserver.perl git-cvsserver: add ability to guess -kb from contents 2008-05-16 12:05:35 -07:00
git-filter-branch.sh Merge 1.5.5.3 in 2008-05-27 22:34:19 -07:00
git-instaweb.sh git-instaweb: improve auto-discovery of httpd and call conventions. 2008-06-13 22:08:30 -07:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-merge-stupid.sh
git-merge.sh git-merge: exclude unnecessary options from OPTIONS_SPEC 2008-05-21 12:54:49 -07:00
git-mergetool.sh Remove the use of '--' in merge program invocation 2008-06-19 14:13:55 -07:00
git-parse-remote.sh
git-pull.sh pull --rebase: exit early when the working directory is dirty 2008-05-22 23:05:11 -07:00
git-quiltimport.sh
git-rebase--interactive.sh git-rebase -i: mention the short command aliases in the todo list 2008-06-08 13:46:37 -07:00
git-rebase.sh Ignore dirty submodule states during rebase and stash 2008-05-15 16:12:43 -07:00
git-relink.perl
git-repack.sh Remove now unnecessary 'sync()' calls 2008-05-31 14:49:29 -07:00
git-request-pull.sh
git-send-email.perl git-send-email: allow whitespace in addressee list 2008-06-08 13:46:38 -07:00
git-sh-setup.sh
git-stash.sh Ignore dirty submodule states during rebase and stash 2008-05-15 16:12:43 -07:00
git-submodule.sh git-submodule - Fix errors regarding resolve_relative_url 2008-06-14 11:34:00 -07:00
git-svn.perl git-svn: don't append extra newlines at the end of commit messages. 2008-06-14 11:47:55 -07:00
GIT-VERSION-GEN GIT 1.5.6 2008-06-18 13:09:43 -07:00
git-web--browse.sh
git.c Ignore .gitattributes in bare repositories 2008-06-09 15:08:26 -07:00
git.spec.in Update RPM spec to drop curl executable requirement 2008-06-15 13:47:14 -07:00
graph.c git log --graph: print '*' for all commits, including merges 2008-06-06 11:56:43 -07:00
graph.h log --graph --left-right: show left/right information in place of '*' 2008-05-25 12:06:52 -07:00
grep.c
grep.h
hash-object.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
hash.c
hash.h
help.c Print info about "git help COMMAND" on git's main usage pages 2008-06-06 09:22:18 -07:00
http-push.c http-push.c: remove duplicated code 2008-06-08 13:46:37 -07:00
http-walker.c
http.c Don't allocate too much memory in quote_ref_url 2008-06-14 12:53:09 -07:00
http.h
ident.c commit: Show committer if automatic 2008-05-06 16:50:17 -07:00
imap-send.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
index-pack.c Make pack creation always fsync() the result 2008-05-31 14:46:57 -07:00
INSTALL The "curl" executable is no longer required 2008-06-15 13:44:44 -07:00
interpolate.c
interpolate.h
list-objects.c
list-objects.h
ll-merge.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
ll-merge.h
lockfile.c rollback lock files on more signals than just SIGINT 2008-05-31 14:33:59 -07:00
log-tree.c log --graph --left-right: show left/right information in place of '*' 2008-05-25 12:06:52 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Makefile: update check-docs target 2008-06-15 13:43:32 -07:00
match-trees.c
merge-file.c
merge-index.c
merge-recursive.h
merge-tree.c
mktag.c
mktree.c
name-hash.c
object.c
object.h
pack-check.c make verify-pack a bit more useful with bad packs 2008-06-01 23:25:38 -07:00
pack-redundant.c
pack-revindex.c
pack-revindex.h
pack-write.c Make pack creation always fsync() the result 2008-05-31 14:46:57 -07:00
pack.h
pager.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
parse-options.c
parse-options.h
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path-list.c
path-list.h
path.c make_nonrelative_path: Use is_absolute_path() 2008-06-08 10:48:01 -07:00
pkt-line.c
pkt-line.h
pretty.c log --pretty: do not accept bogus "--prettyshort" 2008-05-25 20:29:07 -07:00
progress.c progress.c: avoid use of dynamic-sized array 2008-06-08 13:56:32 -07:00
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Add shortcut in refresh_cache_ent() for marked entries. 2008-05-31 14:18:20 -07:00
README
receive-pack.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
refs.h Allow for having for_each_ref() list extra refs 2008-05-04 17:41:44 -07:00
RelNotes GIT 1.5.5.4 2008-06-07 11:45:48 -07:00
remote.c clean up error conventions of remote.c:match_explicit 2008-06-18 12:39:13 -07:00
remote.h Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
revision.c log --pretty: do not accept bogus "--prettyshort" 2008-05-25 20:29:07 -07:00
revision.h log and rev-list: add --graph option 2008-05-05 18:46:35 -07:00
run-command.c
run-command.h
send-pack.h
server-info.c
setup.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c sha1_file.c: simplify parse_pack_index() 2008-06-16 22:19:00 -07:00
sha1_name.c
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
strbuf.c
strbuf.h
symlinks.c Optimize symlink/directory detection 2008-05-10 18:16:31 -07:00
tag.c
tag.h
tar.h
test-absolute-path.c
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-parse-options.c
test-sha1.c
test-sha1.sh
thread-utils.c
thread-utils.h
trace.c
transport.c Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
transport.h Mark the list of refs to fetch as const 2008-05-04 17:41:44 -07:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
unpack-trees.c unpack_trees(): allow callers to differentiate worktree errors from merge errors 2008-05-29 17:35:21 -07:00
unpack-trees.h unpack-trees: allow Porcelain to give different error messages 2008-05-19 19:30:13 -07:00
update-server-info.c
upload-pack.c
usage.c
utf8.c
utf8.h
var.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
walker.c Fix "git clone http://$URL" to check out the worktree when asked 2008-06-04 13:33:25 -07:00
walker.h
write_or_die.c Make pack creation always fsync() the result 2008-05-31 14:46:57 -07:00
ws.c
wt-status.c Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
wt-status.h Merge branch 'js/config-cb' 2008-05-25 14:25:02 -07:00
xdiff-interface.c
xdiff-interface.h

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.