mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-07 16:36:13 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
18,580 Commits 6 Branches 947 Tags 323 MiB
C 50%
Shell 38.7%
Perl 5.3%
Tcl 3.4%
Python 0.8%
Other 1.6%
Go to file
Alex Riesen 718135e3b6 Clarify kind of conflict in merge-one-file helper 
Not as verbose as the recursive merge driver, but better still.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 		2009-05-09 00:27:39 -07:00
Documentation git config: clarify --add and --get-color 2009-05-09 00:19:25 -07:00
arm fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
compat Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
contrib completion: complete values for send-email 2009-05-05 22:05:37 -07:00
git-gui Merge git://repo.or.cz/git-gui 2009-05-01 22:11:57 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2009-04-30 19:56:28 -07:00
gitweb Documentation: fix typos / spelling mistakes 2009-04-20 15:56:07 -07:00
mozilla-sha1 fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
perl add --html-path to get the location of installed HTML docs 2009-04-04 23:57:59 -07:00
ppc fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
t t4029: use sh instead of bash 2009-05-06 18:16:26 -07:00
templates hook/update: example of how to prevent branch creation 2009-04-17 21:26:11 -07:00
xdiff Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
.gitattributes git-gui: Use gitattribute "encoding" for file content display 2008-09-24 12:48:31 -07:00
.gitignore Merge branch 'da/difftool' 2009-04-17 21:42:12 -07:00
.mailmap .mailmap update 2008-07-19 11:25:51 -07:00
COPYING
…
GIT-VERSION-GEN GIT 1.6.3 2009-05-06 18:16:40 -07:00
INSTALL Add support for a pdf version of the user manual 2008-12-10 19:17:43 -08:00
Makefile git-gui: Fixes for Mac OS X TkAqua 2009-05-01 15:04:52 -07:00
README README: fix path to "gitcvs-migration.txt" and be more consistent 2009-02-25 00:49:54 -08:00
RelNotes Start 1.6.3.1 maintenance series. 2009-05-08 21:49:14 -07:00
abspath.c make_absolute_path(): check bounds when seeing an overlong symlink 2008-12-17 13:36:34 -08:00
alias.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
alloc.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
archive-tar.c archive-tar.c: squelch a type mismatch warning 2009-05-08 23:57:29 -07:00
archive-zip.c archive: remove unused headers 2008-07-19 11:17:43 -07:00
archive.c archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
archive.h archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
attr.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
attr.h attr: add GIT_ATTR_INDEX "direction" 2009-04-17 21:05:49 -07:00
base85.c
…
bisect.c rev-list: add "int bisect_show_flags" in "struct rev_list_info" 2009-04-07 22:12:44 -07:00
bisect.h rev-list: add "int bisect_show_flags" in "struct rev_list_info" 2009-04-07 22:12:44 -07:00
blob.c
…
blob.h
…
branch.c strbuf_check_branch_ref(): a helper to check a refname for a branch 2009-03-22 23:52:11 -07:00
branch.h Make git-clone respect branch.autosetuprebase 2009-03-03 22:58:52 -08:00
builtin-add.c Merge branch 'mv/parseopt-ls-files' 2009-03-20 14:30:51 -07:00
builtin-annotate.c
…
builtin-apply.c builtin-apply: keep information about files to be deleted 2009-04-20 13:46:58 -07:00
builtin-archive.c recv_sideband: Bands #2 and #3 always go to stderr 2009-03-10 23:23:02 -07:00
builtin-bisect--helper.c bisect--helper: implement "git bisect--helper" 2009-04-05 01:29:44 -07:00
builtin-blame.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-branch.c shorten_unambiguous_ref(): add strict mode 2009-04-13 09:36:44 -07:00
builtin-bundle.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-cat-file.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-check-attr.c Fix non-literal format in printf-style calls 2008-11-11 14:50:02 -08:00
builtin-check-ref-format.c strbuf_check_branch_ref(): a helper to check a refname for a branch 2009-03-22 23:52:11 -07:00
builtin-checkout-index.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-checkout.c Merge branch 'jc/maint-read-tree-multi' 2009-04-22 19:36:19 -07:00
builtin-clean.c Turn the flags in struct dir_struct into a single variable 2009-02-18 11:04:19 -08:00
builtin-clone.c builtin-clone.c: no need to strdup for setenv 2009-04-01 08:58:55 -07:00
builtin-commit-tree.c Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix 2008-09-18 20:32:50 -07:00
builtin-commit.c Merge branch 'maint-1.6.1' into maint 2009-04-05 01:04:54 -07:00
builtin-config.c git config: error when editing a repo config and not being in one 2009-04-29 16:50:21 -07:00
builtin-count-objects.c Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -07:00
builtin-describe.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-diff-files.c Add cache preload facility 2008-11-14 19:11:49 -08:00
builtin-diff-index.c diff*: fix worktree setup 2008-08-28 20:50:10 -07:00
builtin-diff-tree.c Remove unused assignments 2009-03-14 13:36:34 -07:00
builtin-diff.c reorder ALLOW_TEXTCONV option setting 2008-12-07 19:59:25 -08:00
builtin-fast-export.c builtin-fast-export.c: handle nested tags 2009-04-19 12:29:26 -07:00
builtin-fetch--tool.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
builtin-fetch-pack.c Sync with GIT 1.6.2.5 2009-05-03 16:55:38 -07:00
builtin-fetch.c Merge branch 'db/push-cleanup' 2009-03-26 00:28:46 -07:00
builtin-fmt-merge-msg.c Move local variables to narrower scopes 2009-03-07 20:52:23 -08:00
builtin-for-each-ref.c for-each-ref: utilize core.warnAmbiguousRefs for :short-format 2009-04-13 09:36:52 -07:00
builtin-fsck.c Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -07:00
builtin-gc.c gc --aggressive: make it really aggressive 2009-03-18 19:11:34 -07:00
builtin-grep.c grep: don't support "grep.color"-like config options 2009-04-20 22:55:56 -07:00
builtin-help.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-http-fetch.c Merge branch 'ho/dashless' 2008-09-09 22:57:35 -07:00
builtin-init-db.c Merge branch 'maint' 2009-04-18 14:45:59 -07:00
builtin-log.c Merge branch 'sb/format-patch-patchname' 2009-04-06 00:42:23 -07:00
builtin-ls-files.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07: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 Produce a nicer output in case of sha1_object_info failures in ls-tree -l 2009-03-20 09:35:21 -07:00
builtin-mailinfo.c Remove unused assignments 2009-03-14 13:36:34 -07:00
builtin-mailsplit.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
builtin-merge-base.c parse-opt: migrate git-merge-base. 2008-10-02 18:46:02 -07:00
builtin-merge-file.c merge-file: handle freopen() failure 2008-12-26 19:10:02 -08:00
builtin-merge-ours.c git-merge-ours: make it a builtin. 2007-11-22 14:21:59 -08:00
builtin-merge-recursive.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-merge.c Merge branch 'maint' 2009-04-28 00:46:39 -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 Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
builtin-pack-refs.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
builtin-prune-packed.c prune-packed: advanced progress even for non-existing fan-out directories 2009-04-27 01:06:35 -07:00
builtin-prune.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
builtin-push.c Merge branch 'fg/push-default' 2009-03-26 00:26:25 -07:00
builtin-read-tree.c Merge branch 'jc/maint-read-tree-multi' 2009-04-22 19:36:19 -07:00
builtin-receive-pack.c improve missing repository error message 2009-03-04 20:37:21 -08:00
builtin-reflog.c Fix more typos/spelling in comments 2009-04-22 19:03:39 -07:00
builtin-remote.c builtin-remote: fix typo in option description 2009-04-20 15:55:56 -07:00
builtin-rerere.c rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
builtin-reset.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
builtin-rev-list.c Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
builtin-rev-parse.c rev-parse: --abbrev-ref option to shorten ref name 2009-04-13 09:42:55 -07:00
builtin-revert.c Merge branch 'maint-1.6.1' into maint 2009-03-07 21:00:27 -08:00
builtin-rm.c builtin-rm: use warning() instead of fprintf(stderr, "warning: ") 2009-03-23 21:02:27 -07:00
builtin-send-pack.c builtin-send-pack.c: avoid empty structure initialization 2009-03-26 21:01:34 -07:00
builtin-shortlog.c Remove unused assignments 2009-03-14 13:36:34 -07:00
builtin-show-branch.c builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ") 2009-03-23 21:02:27 -07:00
builtin-show-ref.c builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ") 2009-03-23 21:02:27 -07:00
builtin-stripspace.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-symbolic-ref.c symbolic-ref: allow refs/<whatever> in HEAD 2009-02-13 18:20:44 -08:00
builtin-tag.c git-tag: Add --contains option 2009-01-28 11:33:51 -08:00
builtin-tar-tree.c archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
builtin-unpack-objects.c Merge branch 'lt/maint-wrap-zlib' into maint 2009-02-05 18:01:00 -08:00
builtin-update-index.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -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 improve missing repository error message 2009-03-04 20:37:21 -08:00
builtin-verify-pack.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
builtin-verify-tag.c builtin-verify-tag: fix -v option parsing 2008-07-28 23:02:11 -07:00
builtin-write-tree.c git add --intent-to-add: do not let an empty blob be committed by accident 2008-11-30 17:59:19 -08:00
builtin.h bisect--helper: implement "git bisect--helper" 2009-04-05 01:29:44 -07:00
bundle.c Merge branch 'js/maint-all-implies-HEAD' 2009-01-25 17:13:02 -08:00
bundle.h
…
cache-tree.c Move prime_cache_tree() to cache-tree.c 2009-04-20 04:16:41 -07:00
cache-tree.h Move prime_cache_tree() to cache-tree.c 2009-04-20 04:16:41 -07:00
cache.h Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -07:00
check-builtins.sh
…
check-racy.c
…
check_bindir Move all dashed-form commands to libexecdir 2008-06-19 16:00:38 -07:00
color.c Clean up use of ANSI color sequences 2009-02-13 17:27:58 -08:00
color.h graph API: Added logic for colored edges 2009-04-13 22:41:25 -07:00
combine-diff.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
command-list.txt difftool: move 'git-difftool' out of contrib 2009-04-07 22:19:56 -07:00
commit.c Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
commit.h Make has_commit() non-static 2009-01-28 11:33:03 -08:00
config.c improve error message in config.c 2009-05-05 22:49:43 -07:00
config.mak.in config.mak.in: define paths without trailing slash 2009-02-05 00:29:23 -08:00
configure.ac configure: rework pthread handling to allow for user defined flags 2009-03-12 23:23:39 -07:00
connect.c connect: replace inet_ntop with getnameinfo 2009-04-25 09:29:38 -07:00
convert.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
copy.c copy.c: copy_fd - correctly report write errors 2008-04-22 21:21:08 -07:00
csum-file.c Merge branch 'maint' 2008-10-10 08:39:20 -07:00
csum-file.h Merge branch 'maint' 2008-10-10 08:39:20 -07:00
ctype.c ctype.c: fix typo in comment 2009-05-01 16:07:29 -07:00
daemon.c daemon.c: fix segfault on OS X 2009-04-29 16:50:21 -07:00
date.c Work around BSD whose typeof(tv.tv_sec) != time_t 2009-05-05 22:19:14 -07: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 fix style of a few comments in diff-delta.c 2007-12-18 15:22:28 -08:00
diff-lib.c Merge branch 'kb/checkout-optim' 2009-03-17 18:54:31 -07:00
diff-no-index.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
diff.c Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -07:00
diff.h Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking 2009-03-04 00:56:51 -08:00
diffcore-break.c Remove unused function scope local variables 2009-03-07 20:52:17 -08:00
diffcore-delta.c
…
diffcore-order.c
…
diffcore-pickaxe.c pickaxe: count regex matches only once 2009-03-21 23:18:53 -07:00
diffcore-rename.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
diffcore.h Merge branch 'maint' 2008-11-02 16:36:40 -08:00
dir.c Merge branch 'maint' 2009-05-05 22:52:17 -07:00
dir.h Turn the flags in struct dir_struct into a single variable 2009-02-18 11:04:19 -08:00
editor.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
entry.c Windows: Skip fstat/lstat optimization in write_entry() 2009-04-20 12:14:02 -07:00
environment.c Rename core.unreliableHardlinks to core.createObject 2009-04-29 16:50:07 -07:00
exec_cmd.c Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1 2009-04-08 23:01:10 -07:00
exec_cmd.h Refactor git_set_argv0_path() to git_extract_argv0_path() 2009-01-26 00:26:05 -08:00
fast-import.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
fetch-pack.h Teach fetch-pack/upload-pack about --include-tag 2008-03-04 23:28:14 -08:00
fixup-builtins make remove-dashes: apply to scripts and programs as well, not just to builtins 2008-07-11 21:13:17 -07:00
fsck.c Remove unused function scope local variables 2009-03-07 20:52:17 -08:00
fsck.h Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
generate-cmdlist.sh generate-cmdlist.sh: avoid selecting synopsis at wrong place 2008-11-30 18:16:32 -08:00
git-add--interactive.perl Merge branch 'mm/maint-add-p-quit' 2009-04-20 03:39:38 -07:00
git-am.sh Work around ash "alternate value" expansion bug 2009-04-18 21:37:46 -07:00
git-archimport.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-bisect.sh Merge branch 'cc/bisect-filter' 2009-04-12 16:46:40 -07:00
git-compat-util.h NetBSD compilation fix 2009-04-27 09:54:24 -07:00
git-cvsexportcommit.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-cvsimport.perl Merge branch 'maint' 2008-08-05 21:21:08 -07:00
git-cvsserver.perl git-cvsserver: run post-update hook *after* update. 2009-01-30 21:11:46 -08:00
git-difftool--helper.sh mergetool--lib: simplify API usage by removing more global variables 2009-04-12 15:19:12 -07:00
git-difftool.perl Explain seemingly pointless use of system in difftool 2009-04-24 01:20:35 -07:00
git-filter-branch.sh Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-instaweb.sh git-instaweb: fix lighttpd configuration on cygwin 2009-03-10 23:16:52 -07:00
git-lost-found.sh lost-found: use git rev-parse -q 2008-12-03 14:27:17 -08:00
git-merge-octopus.sh git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge 2008-07-30 00:20:51 -07:00
git-merge-one-file.sh Clarify kind of conflict in merge-one-file helper 2009-05-09 00:27:39 -07:00
git-merge-resolve.sh Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-mergetool--lib.sh mergetool--lib: simplify API usage by removing more global variables 2009-04-12 15:19:12 -07:00
git-mergetool.sh mergetool--lib: simplify API usage by removing more global variables 2009-04-12 15:19:12 -07:00
git-parse-remote.sh Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-pull.sh Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-quiltimport.sh git-quiltimport: preserve standard input to be able to read user input 2009-02-25 00:49:13 -08:00
git-rebase--interactive.sh rebase -i: avoid 'git reset' when possible 2009-03-03 10:56:22 -08:00
git-rebase.sh rebase: fix typo (force_rebas -> force-rebas) 2009-03-27 14:26:34 -07:00
git-relink.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-repack.sh Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -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 Add parsing of elm aliases to git-send-email 2009-04-22 19:10:41 -07:00
git-sh-setup.sh git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree 2009-02-07 00:45:29 -08:00
git-stash.sh Revert "git-stash: use git rev-parse -q" 2008-12-07 17:30:35 -08:00
git-submodule.sh Work around ash "alternate value" expansion bug 2009-04-18 21:37:46 -07:00
git-svn.perl Merge branch 'maint' 2009-05-05 22:52:17 -07:00
git-web--browse.sh git-web--browse: Fix check for /bin/start 2009-02-09 00:06:36 -08:00
git.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
git.spec.in Merge branch 'maint-1.6.0' into maint 2009-02-05 19:38:58 -08:00
graph.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
graph.h graph.c: make many functions static 2008-09-25 08:00:28 -07:00
grep.c Merge branch 'maint' 2009-04-28 00:46:39 -07:00
grep.h grep: add support for coloring with external greps 2009-03-07 11:34:59 -08:00
hash-object.c Merge branch 'en/maint-hash-object' into maint 2009-03-11 13:51:59 -07:00
hash.c Add 'const' where appropriate to index handling functions 2008-03-09 00:43:48 -08:00
hash.h Add 'const' where appropriate to index handling functions 2008-03-09 00:43:48 -08:00
help.c git wrapper: also use aliases to correct mistyped commands 2008-09-11 23:05:39 -07:00
help.h Merge branch 'ar/autospell' 2008-09-07 23:52:16 -07:00
http-push.c Replace ",<,>,& with their respective XML entities in DAV requests 2009-04-11 22:21:59 -07:00
http-walker.c Move chmod(foo, 0444) into move_temp_to_file() 2009-03-27 22:10:58 -07:00
http.c Allow curl to rewind the read buffers 2009-04-02 13:04:07 -07:00
http.h Allow curl to rewind the read buffers 2009-04-02 13:04:07 -07:00
ident.c Add backslash to list of 'crud' characters in real name 2008-12-02 15:29:13 -08:00
imap-send.c Remove unused assignments 2009-03-14 13:36:34 -07:00
index-pack.c Merge branch 'jc/shared-literally' 2009-04-06 00:42:52 -07:00
levenshtein.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
levenshtein.h git wrapper: DWIM mistyped commands 2008-08-31 10:14:58 -07:00
list-objects.c Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
list-objects.h Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
ll-merge.c merge-recursive: use strbuf_expand() instead of interpolate() 2008-11-23 19:55:52 -08:00
ll-merge.h merge-recursive: split low-level merge functions out. 2008-02-18 00:46:13 -08:00
lockfile.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
log-tree.c log-tree: fix patch filename computation in "git format-patch" 2009-03-27 01:10:27 -07:00
log-tree.h format-patch: --attach/inline uses filename instead of SHA1 2009-03-22 21:45:19 -07:00
mailmap.c Merge branch 'maint' 2009-04-01 22:46:31 -07:00
mailmap.h Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -08:00
match-trees.c
…
merge-file.c Always initialize xpparam_t to 0 2008-10-25 12:09:31 -07:00
merge-index.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
merge-recursive.c merge-recursive: do not die on a conflicting submodule 2009-04-29 16:50:21 -07:00
merge-recursive.h merge-recursive: move current_{file,directory}_set to struct merge_options 2008-09-04 22:50:43 -07:00
merge-tree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktag.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
name-hash.c Make hash_name_lookup able to do case-independent lookups 2008-04-09 01:22:25 -07:00
object.c bundle: allow the same ref to be given more than once 2009-01-17 23:00:31 -08:00
object.h Merge branch 'js/maint-all-implies-HEAD' into maint 2009-02-05 17:54:12 -08:00
pack-check.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
pack-redundant.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
pack-refs.c Enhance hold_lock_file_for_{update,append}() API 2008-10-19 12:35:37 -07:00
pack-refs.h Move pack_refs() and friends into libgit 2008-06-19 15:53:13 -07:00
pack-revindex.c make find_pack_revindex() aware of the nasty world 2008-11-02 15:22:35 -08:00
pack-revindex.h discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-write.c Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1 2009-03-21 22:53:36 -07:00
pack.h improve reliability of fixup_pack_header_footer() 2008-08-29 21:51:27 -07:00
pager.c pager: do wait_for_pager on signal death 2009-01-21 22:46:53 -08:00
parse-options.c parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together 2009-03-09 15:32:50 -07:00
parse-options.h Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
patch-delta.c
…
patch-id.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
patch-ids.c patch-ids: use the new generic "sha1_pos" function to lookup sha1 2009-04-04 22:57:42 -07:00
patch-ids.h
…
path.c set_shared_perm(): sometimes we know what the final mode bits should look like 2009-03-28 08:02:15 -07:00
pkt-line.c Cleanup xread() loops to use read_in_full() 2008-05-03 22:15:25 -07:00
pkt-line.h
…
preload-index.c Makefile: introduce NO_PTHREADS 2008-12-02 15:29:12 -08:00
pretty.c format_sanitized_subject: Don't trim past initial length of strbuf 2009-04-01 11:05:31 -07:00
progress.c progress bar: round to the nearest instead of truncating down 2009-04-25 08:54:18 -07:00
progress.h
…
quote.c quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array 2009-03-30 01:22:53 -07:00
quote.h quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array 2009-03-30 01:22:53 -07:00
reachable.c process_{tree,blob}: Remove useless xstrdup calls 2009-04-08 22:58:43 -07:00
reachable.h
…
read-cache.c checkout bugfix: use stat.mtime instead of stat.ctime in two places 2009-03-15 12:56:40 -07:00
reflog-walk.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
reflog-walk.h make oneline reflog dates more consistent with multiline format 2009-03-20 00:57:27 -07:00
refs.c shorten_unambiguous_ref(): add strict mode 2009-04-13 09:36:44 -07:00
refs.h shorten_unambiguous_ref(): add strict mode 2009-04-13 09:36:44 -07:00
remote.c remote.c: do not trigger remote.<name>.<var> codepath for two-level names 2009-04-24 01:29:28 -07:00
remote.h remote: New function remote_is_configured() 2009-04-07 21:51:59 -07:00
rerere.c rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
rerere.h rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
revision.c Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
revision.h Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
run-command.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
run-command.h fix portability problem with IS_RUN_COMMAND_ERR 2009-04-01 11:05:54 -07:00
send-pack.h Move push matching and reporting logic into transport.c 2009-03-09 15:41:20 -07:00
server-info.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
setup.c "core.sharedrepository = 0mode" should set, not loosen 2009-03-27 21:51:04 -07:00
sha1-lookup.c sha1-lookup: fix up the assertion message 2009-04-06 00:56:27 -07:00
sha1-lookup.h sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1 2009-04-04 22:57:39 -07:00
sha1_file.c Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -07:00
sha1_name.c Rename interpret/substitute nth_last_branch functions 2009-03-22 23:36:47 -07:00
shallow.c Merge branch 'mk/maint-parse-careful' 2008-02-18 20:56:01 -08:00
shell.c git-shell: Add 'git-upload-archive' to allowed commands. 2009-04-11 11:01:15 -07:00
shortlog.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
show-index.c Fix some warnings (on cygwin) to allow -Werror 2008-07-05 17:26:29 -07:00
sideband.c recv_sideband: Bands #2 and #3 always go to stderr 2009-03-10 23:23:02 -07:00
sideband.h recv_sideband: Bands #2 and #3 always go to stderr 2009-03-10 23:23:02 -07:00
sigchain.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
sigchain.h refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
strbuf.c strbuf_check_branch_ref(): a helper to check a refname for a branch 2009-03-22 23:52:11 -07:00
strbuf.h Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
string-list.c string-list: new for_each_string_list() function 2009-02-27 15:19:08 -08:00
string-list.h string-list: new for_each_string_list() function 2009-02-27 15:19:08 -08:00
symlinks.c Revert "lstat_cache(): print a warning if doing ping-pong between cache types" 2009-03-17 12:10:58 -07:00
tag.c Merge branch 'mk/maint-parse-careful' 2008-03-02 15:11:07 -08:00
tag.h
…
tar.h
…
test-chmtime.c Add --verbose|-v to test-chmtime 2008-10-31 00:19:52 -07:00
test-ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08: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 Introduce the function strip_path_suffix() 2009-02-19 22:45:48 -08:00
test-sha1.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
test-sha1.sh more tr portability test script fixes 2008-03-13 00:57:52 -07:00
test-sigchain.c t0005: use SIGTERM for sigchain test 2009-01-30 01:14:26 -08:00
thread-utils.c pack-objects: Add runtime detection of online CPU's 2008-02-23 12:00:32 -08:00
thread-utils.h pack-objects: Add runtime detection of online CPU's 2008-02-23 12:00:32 -08:00
trace.c trace: Fixed a minor typo in an error message. 2009-02-25 00:49:53 -08:00
transport.c Merge branch 'db/push-cleanup' 2009-03-26 00:28:46 -07:00
transport.h Move push matching and reporting logic into transport.c 2009-03-09 15:41:20 -07:00
tree-diff.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
tree-walk.c Fix tree-walking compare_entry() in the presense of --prefix 2008-03-09 00:43:47 -08:00
tree-walk.h Make 'traverse_trees()' traverse conflicting DF entries in parallel 2008-03-09 00:43:47 -08:00
tree.c Fix off-by-one in read_tree_recursive 2009-04-20 13:44:14 -07:00
tree.h add context pointer to read_tree_recursive() 2008-07-15 07:17:59 -07:00
unimplemented.sh Makefile: allow building without perl 2009-04-08 22:14:56 -07:00
unpack-file.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
unpack-trees.c unpack-trees: do not muck with attributes when we are not checking out 2009-04-17 21:05:49 -07:00
unpack-trees.h checkout: do not lose staged removal 2008-09-09 22:55:22 -07:00
update-server-info.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
upload-pack.c Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
usage.c Increase the size of the die/warning buffer to avoid truncation 2009-03-24 16:58:20 -07:00
userdiff.c Change the spelling of "wordregex". 2009-01-21 23:52:16 -08:00
userdiff.h color-words: make regex configurable via attributes 2009-01-17 10:44:21 -08:00
utf8.c utf8: add utf8_strwidth() 2009-02-04 16:30:43 -08:00
utf8.h utf8: add utf8_strwidth() 2009-02-04 16:30:43 -08:00
var.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
walker.c Drop double-semicolon in C 2009-02-10 22:26:37 -08:00
walker.h Make walker.fetch_ref() take a struct ref. 2008-04-26 17:36:17 -07:00
wrapper.c Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1 2009-03-21 22:53:36 -07:00
write_or_die.c Move read_in_full() and write_in_full() to wrapper.c 2008-07-20 17:17:09 -07:00
ws.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
wt-status.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
wt-status.h Add argument 'no' commit/status option -u|--untracked-files 2008-06-09 15:48:19 -07:00
xdiff-interface.c Remove unused function scope local variables 2009-03-07 20:52:17 -08:00
xdiff-interface.h add xdi_diff_hunks() for callers that only need hunk lengths 2008-10-25 12:09:31 -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/gittutorial.txt to get started, then see
Documentation/everyday.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.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.