microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
A fork of Git containing Microsoft-specific patches.
19 083 коммитов 92 Ветки 771 Тег 436 MiB
C 51.7%
Shell 36.9%
Perl 5.3%
Tcl 3.4%
Python 0.8%
Разное 1.7%
Перейти к файлу
Martin Renold 606475f317 Remove filename from conflict markers 
Put filenames into the conflict markers only when they are different.
Otherwise they are redundant information clutter.

Print the filename explicitely when warning about a binary conflict.

Signed-off-by: Martin Renold <martinxyz@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 		2009-07-01 19:46:30 -07:00
Documentation Merge branch 'cc/bisect' 2009-07-01 19:41:04 -07:00
arm fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
compat Merge branch 'sp/msysgit' 2009-06-13 12:50:42 -07:00
contrib completion: add missing config variables 2009-06-30 11:20:04 -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-06-20 11:54:37 -07:00
gitweb Merge branch 'maint' 2009-06-27 13:44:25 -07:00
mozilla-sha1 fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
perl Git.pm: Always set Repository to absolute path if autodetecting 2009-05-09 08:25:55 -07:00
ppc fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
t Remove filename from conflict markers 2009-07-01 19:46:30 -07:00
templates Merge branch 'hv/sample-update' 2009-05-23 01:39:15 -07:00
xdiff Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint 2009-06-02 07:48:44 -07:00
.gitattributes .gitattributes: CR at the end of the line is an error 2009-06-21 10:42:37 -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.3 2009-06-21 21:15:50 -07:00
INSTALL Add support for a pdf version of the user manual 2008-12-10 19:17:43 -08:00
Makefile Merge branch 'maint' 2009-06-30 16:12:35 -07:00
README README: fix path to "gitcvs-migration.txt" and be more consistent 2009-02-25 00:49:54 -08:00
RelNotes GIT 1.6.3.3 2009-06-21 21:15:50 -07:00
abspath.c make_absolute_path(): check bounds when seeing an overlong symlink 2008-12-17 13:36:34 -08:00
alias.c Merge branch 'jk/maint-1.6.0-trace-argv' into maint 2009-05-25 19:03:20 -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 parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
archive.h archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
attr.c attr: plug minor memory leak 2009-06-30 16:12:24 -07:00
attr.h attr: add GIT_ATTR_INDEX "direction" 2009-04-17 21:05:49 -07:00
base85.c Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -07:00
bisect.c Merge branch 'cc/bisect' 2009-07-01 19:41:04 -07:00
bisect.h bisect: add parameters to "filter_skipped" 2009-06-06 11:26:56 -07:00
blob.c Clean up object creation to use more common code 2007-04-16 23:36:16 -07:00
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 'sb/maint-1.6.0-add-config-fix' into maint 2009-06-22 00:44:09 -07:00
builtin-annotate.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-apply.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
builtin-archive.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-bisect--helper.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-blame.c Merge branch 'maint' 2009-06-03 00:49:40 -07:00
builtin-branch.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-bundle.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-cat-file.c Merge branch 'sb/opt-filename' 2009-05-31 16:57:42 -07:00
builtin-check-attr.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07: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 parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-checkout.c Merge branch 'lt/maint-diff-reduce-lstat' into maint 2009-05-25 19:04:08 -07:00
builtin-clean.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-clone.c Fix various sparse warnings in the git source code 2009-06-20 21:52: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 parse-opts: add OPT_FILENAME and transition builtins 2009-05-25 01:07:33 -07:00
builtin-config.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-count-objects.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-describe.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -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 parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-fetch--tool.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
builtin-fetch-pack.c fetch-pack: close output channel after sideband demultiplexer terminates 2009-06-08 21:18:41 -07:00
builtin-fetch.c Merge branch 'sb/opt-filename' 2009-05-31 16:57:42 -07:00
builtin-fmt-merge-msg.c Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint 2009-06-02 07:47:03 -07:00
builtin-for-each-ref.c Merge branch 'ak/maint-for-each-ref-no-lookup' 2009-06-18 10:33:09 -07:00
builtin-fsck.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
builtin-gc.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-grep.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-help.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -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 Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
builtin-ls-files.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -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 builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback encoding 2009-05-18 20:53:15 -07:00
builtin-mailsplit.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
builtin-merge-base.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-merge-file.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-merge-ours.c git-merge-ours: make it a builtin. 2007-11-22 14:21:59 -08:00
builtin-merge-recursive.c MinGW: Fix compiler warning in merge-recursive 2009-05-23 01:54:45 -07:00
builtin-merge.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
builtin-mktree.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-mv.c git-mv: fix directory separator treatment on Windows 2009-06-30 11:23:21 -07:00
builtin-name-rev.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-pack-objects.c Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -07:00
builtin-pack-refs.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-prune-packed.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-prune.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-push.c Allow push and fetch urls to be different 2009-06-09 23:46:47 -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 receive-pack: do not send error details to the client 2009-06-21 20:19:21 -07:00
builtin-reflog.c Fix more typos/spelling in comments 2009-04-22 19:03:39 -07:00
builtin-remote.c Merge branch 'cf/maint-remote-uploadpack-useconfig-fix' 2009-07-01 19:40:54 -07:00
builtin-rerere.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-reset.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-rev-list.c bisect: add parameters to "filter_skipped" 2009-06-06 11:26:56 -07:00
builtin-rev-parse.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-revert.c Merge branch 'sb/opt-filename' 2009-05-31 16:57:42 -07:00
builtin-rm.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-send-pack.c Merge branch 'cb/match_refs_internal_tail' 2009-06-13 12:47:52 -07:00
builtin-shortlog.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-show-branch.c show-branch: don't use LASTARG_DEFAULT with OPTARG 2009-06-09 00:15:57 -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 parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-tag.c parse-options: make OPT_INTEGER's argh explicit 2009-06-06 13:25:01 -07: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 Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
builtin-update-index.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-update-ref.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-upload-archive.c Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint 2009-06-21 21:08:05 -07:00
builtin-verify-pack.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
builtin-verify-tag.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-write-tree.c write-tree --ignore-cache-tree 2009-05-20 11:07:07 -07:00
builtin.h build-in git-mktree 2009-05-10 12:41:35 -07:00
bundle.c Terminate argv with NULL before calling setup_revisions() 2009-05-21 08:56:24 -07:00
bundle.h Move bundle specific stuff into bundle.[ch] 2007-09-19 03:22:30 -07:00
cache-tree.c Optimize "diff-index --cached" using cache-tree 2009-05-25 11:35:29 -07:00
cache-tree.h Optimize "diff-index --cached" using cache-tree 2009-05-25 11:35:29 -07:00
cache.h diff: generate pretty filenames in prep_temp_blob() 2009-05-31 17:57:59 -07:00
check-builtins.sh
…
check-racy.c ce_match_stat, run_diff_files: use symbolic constants for readability 2007-11-10 00:24:51 -08:00
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 bisect: drop unparse_commit() and use clear_commit_marks() 2009-05-27 13:45:45 -07:00
commit.h bisect: drop unparse_commit() and use clear_commit_marks() 2009-05-27 13:45:45 -07:00
config.c improve error message in config.c 2009-05-05 22:49:43 -07:00
config.mak.in Merge branch 'bc/solaris' 2009-06-13 12:48:34 -07:00
configure.ac Merge branch 'mn/maint-iconv-autoconf' 2009-06-20 21:47:22 -07:00
connect.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -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 Merge branch 'js/daemon-log' 2009-07-01 19:41:00 -07:00
date.c Work around BSD whose typeof(tv.tv_sec) != time_t 2009-05-05 22:19:14 -07:00
decorate.c Unify signedness in hashing calls 2009-05-20 00:02:24 -07:00
decorate.h decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
delta.h Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -07:00
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 'jc/cache-tree' 2009-06-20 21:47:30 -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 'maint' 2009-06-09 00:29:36 -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 optimize diffcore-delta by sorting hash entries. 2007-10-04 00:05:36 -07:00
diffcore-order.c Use xmemdupz() in many places. 2007-09-18 17:42:17 -07:00
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 git-add: no need for -f when resolving a conflict in already tracked path 2009-05-31 15:59:16 -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 replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -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 Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -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 add -i: do not dump patch during application 2009-06-03 00:11:15 -07:00
git-am.sh am, rebase: teach quiet option 2009-06-18 11:54:48 -07:00
git-archimport.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-bisect.sh bisect: make "git bisect" use new "--next-all" bisect-helper function 2009-05-10 14:30:33 -07:00
git-compat-util.h Merge branch 'bc/solaris' 2009-06-13 12:48:34 -07:00
git-cvsexportcommit.perl Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch 2009-06-18 10:19:50 -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: add support for araxis merge 2009-05-24 11:21:05 -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 parse-remote: remove unused functions 2009-06-11 19:50:45 -07:00
git-pull.sh Merge branch 'sb/pull-rebase' 2009-06-20 21:47:13 -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 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint 2009-06-11 14:14:00 -07:00
git-rebase.sh Merge branch 'sb/quiet-porcelains' 2009-07-01 19:40:50 -07:00
git-relink.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-repack.sh submodule, repack: migrate to git-sh-setup's say() 2009-06-18 09:50:37 -07:00
git-request-pull.sh request-pull: really really disable pager 2009-07-01 13:20:00 -07:00
git-send-email.perl Test cccmd in t9001-send-email.sh and fix some bugs 2009-06-18 09:55:59 -07:00
git-sh-setup.sh git-sh-setup: introduce say() for quiet options 2009-06-18 09:50:31 -07:00
git-stash.sh stash: teach quiet option 2009-06-18 11:54:57 -07:00
git-submodule.sh Merge branch 'sb/quiet-porcelains' 2009-07-01 19:40:50 -07:00
git-svn.perl git-svn: Canonicalize svn urls to prevent libsvn assertion 2009-06-26 14:08:52 -07:00
git-web--browse.sh git: browsing paths with spaces when using the start command 2009-06-01 00:22:01 -07:00
git.c git.c: avoid allocating one-too-many elements for new argv array 2009-06-30 16:12:14 -07:00
git.spec.in Merge branch 'maint-1.6.0' into maint 2009-02-05 19:38:58 -08:00
graph.c Merge branch 'ac/graph-horizontal-line' 2009-05-18 08:59:30 -07:00
graph.h graph.c: make many functions static 2008-09-25 08:00:28 -07:00
grep.c grep: fix empty word-regexp matches 2009-06-03 11:32:29 -07:00
grep.h grep: use parseopt 2009-05-09 00:29:56 -07:00
hash-object.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -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 Merge branch 'rc/maint-http-local-slot-fix' into maint 2009-06-21 21:15:31 -07:00
http-walker.c Merge branch 'rc/maint-http-local-slot-fix' into maint 2009-06-21 21:15:31 -07:00
http.c Merge branch 'maint' 2009-06-18 10:39:17 -07:00
http.h http*: add helper methods for fetching objects (loose) 2009-06-06 11:03:11 -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 Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
index-pack.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -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 Remove filename from conflict markers 2009-07-01 19:46:30 -07:00
ll-merge.h merge-recursive: split low-level merge functions out. 2008-02-18 00:46:13 -08:00
lockfile.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
log-tree.c log-tree: fix confusing comment 2009-07-01 11:16:54 -07:00
log-tree.h format-patch: --attach/inline uses filename instead of SHA1 2009-03-22 21:45:19 -07:00
mailmap.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
mailmap.h Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -08:00
match-trees.c Improved const correctness for strings 2007-10-21 01:43:27 -04:00
merge-file.c Always initialize xpparam_t to 0 2008-10-25 12:09:31 -07:00
merge-index.c Simplify some instances of run_command() by using run_command_v_opt(). 2009-06-09 00:15:57 -07:00
merge-recursive.c Remove filename from conflict markers 2009-07-01 19:46:30 -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
name-hash.c Make hash_name_lookup able to do case-independent lookups 2008-04-09 01:22:25 -07:00
object.c Unify signedness in hashing calls 2009-05-20 00:02:24 -07:00
object.h Merge branch 'js/maint-all-implies-HEAD' into maint 2009-02-05 17:54:12 -08:00
pack-check.c Don't expect verify_pack() callers to set pack_size 2009-06-06 10:56:27 -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 replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -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 Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
parse-options.h Merge branch 'sb/parse-options-integer' 2009-06-18 10:36:22 -07:00
patch-delta.c Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -07:00
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 Refactor patch-id filtering out of git-cherry and git-format-patch. 2007-04-11 20:02:03 -07:00
path.c diff: generate pretty filenames in prep_temp_blob() 2009-05-31 17:57:59 -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 Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility 2009-05-18 20:53:12 -07:00
progress.c progress bar: round to the nearest instead of truncating down 2009-04-25 08:54:18 -07:00
progress.h nicer display of thin pack completion 2007-11-08 15:43:41 -08:00
quote.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -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 Merge branch 'maint' 2009-05-25 19:44:52 -07:00
refs.h Change prettify_ref to prettify_refname 2009-05-13 20:55:48 -07:00
remote.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
remote.h Merge branch 'mg/pushurl' 2009-06-20 21:47:27 -07:00
rerere.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
rerere.h rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
revision.c git log: add '--merges' flag to match '--no-merges' 2009-06-29 12:32:51 -07:00
revision.h git log: add '--merges' flag to match '--no-merges' 2009-06-29 12:32:51 -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 allow OFS_DELTA objects during a push 2009-05-01 22:06:41 -07:00
server-info.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -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 Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -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 fread does not return negative on error 2009-06-23 16:57:15 -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 symlinks.c: small style cleanup 2009-06-07 16:23:04 -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 test-chmtime: work around Windows limitation 2009-06-01 00:10:08 -07:00
test-ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
test-date.c
…
test-delta.c Fix compilation of test-delta 2007-05-01 02:59:08 -07:00
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 A new merge stragety 'subtree'. 2007-04-07 02:29:40 -07:00
test-parse-options.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -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 'rc/http-push' 2009-06-13 12:53:19 -07:00
transport.h fetch: Strip usernames from url's before storing them 2009-04-21 00:05:21 -07:00
tree-diff.c Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory' 2009-07-01 19:40:47 -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 Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
unpack-trees.h Optimize "diff-index --cached" using cache-tree 2009-05-25 11:35:29 -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 upload-pack: squelch progress indicator if client cannot see it 2009-06-18 11:38:43 -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 avoid exponential regex match for java and objc function names 2009-06-18 09:52:10 -07:00
userdiff.h color-words: make regex configurable via attributes 2009-01-17 10:44:21 -08:00
utf8.c On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec 2009-06-06 13:21:05 -07: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 Introduce an unlink(2) wrapper which gives warning if unlink failed 2009-04-29 18:37:41 -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 attribute: whitespace set to true detects all errors known to git 2009-06-21 10:43:10 -07:00
wt-status.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -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.