mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,918 Commits 6 Branches 956 Tags 512 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
ae745487ad
Go to file
Elijah Newren ae745487ad merge-recursive: Fix multiple file rename across D/F conflict 
In 5a2580d (merge_recursive: Fix renames across paths below D/F conflicts
2010-07-09), detection was added for renames across paths involved in a
directory<->file conflict.  However, the change accidentally involved
reusing an outer loop index ('i') in an inner loop, changing its values
and causing a slightly different type of breakage for cases where there are
multiple renames across the D/F conflict.  Fix by creating a new temporary
variable 'i'.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-18 12:08:08 -07:00
block-sha1 remove ARM and Mozilla SHA1 implementations 2009-08-18 14:19:40 -07:00
builtin fast-export: Fix output order of D/F changes 2010-07-09 16:16:29 -07:00
compat Merge branch 'maint' 2010-04-19 22:41:30 -07:00
contrib Merge branch 'sg/bash-completion' 2010-04-06 14:50:45 -07:00
Documentation Git 1.7.1 2010-04-23 18:27:17 -07:00
git_remote_helpers Correct references to /usr/bin/python which does not exist on FreeBSD 2010-03-24 14:33:54 -07:00
git-gui Merge git://repo.or.cz/git-gui 2010-02-07 15:52:28 -08:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2010-04-18 18:36:41 -07:00
gitweb gitweb: simplify gitweb.min.* generation and clean-up rules 2010-04-17 12:40:19 -07:00
perl git-svn: support fetch with autocrlf on 2010-03-05 02:57:57 -08:00
ppc fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
t merge-recursive: Fix multiple file rename across D/F conflict 2010-08-18 12:08:08 -07:00
templates Modernize git calling conventions in hook templates 2010-03-20 09:04:38 -07:00
xdiff xdl_merge(): move file1 and file2 labels to xmparam structure 2010-03-20 20:36:10 -07:00
.gitattributes .gitattributes: detect 8-space indent in shell scripts 2010-01-06 12:22:25 -08:00
.gitignore Add .depend directories to .gitignore 2010-04-15 00:53:08 -07:00
.mailmap Merge branch 'mg/mailmap-update' into maint 2010-04-09 22:22:06 -07:00
abspath.c make_absolute_path(): Do not append redundant slash 2010-02-14 13:21:31 -08:00
advice.c Reword "detached HEAD" notification 2010-01-29 22:11:00 -08:00
advice.h Reword "detached HEAD" notification 2010-01-29 22:11:00 -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 Merge branch 'jc/conflict-marker-size' 2010-01-20 20:28:51 -08:00
archive.h archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
attr.c git_attr(): fix function signature 2010-01-16 20:39:59 -08:00
attr.h git_attr(): fix function signature 2010-01-16 20:39:59 -08:00
base85.c Merge branch 'maint-1.6.2' into maint-1.6.3 2010-01-18 21:29:47 -08:00
bisect.c Merge branch 'cc/maint-bisect-paths' into maint-1.6.6 2010-03-07 14:53:35 -08:00
bisect.h builtin-rev-list.c: mark file-local function static 2010-01-11 23:16:16 -08:00
blob.c Replace parse_blob() with an explanatory comment 2010-01-18 17:04:02 -08:00
blob.h Replace parse_blob() with an explanatory comment 2010-01-18 17:04:02 -08:00
branch.c Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint 2010-04-11 13:39:47 -07:00
branch.h Make git-clone respect branch.autosetuprebase 2009-03-03 22:58:52 -08:00
builtin.h notes: implement helpers needed for note copying during rewrite 2010-03-12 21:55:39 -08:00
bundle.c Merge branch 'jc/log-stdin' 2009-11-23 22:30:08 -08:00
bundle.h
cache-tree.c Improve on the 'invalid object' error message at commit time 2009-07-14 13:50:33 -07:00
cache-tree.h Optimize "diff-index --cached" using cache-tree 2009-05-25 11:35:29 -07:00
cache.h fix const-correctness of write_sha1_file 2010-04-01 23:49:03 -07:00
check_bindir Move all dashed-form commands to libexecdir 2008-06-19 16:00:38 -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
color.c Merge branch 'jc/color-attrs' into maint 2010-03-24 16:24:13 -07:00
color.h Merge branch 'jc/color-attrs' into maint 2010-03-24 16:24:13 -07:00
combine-diff.c combined diff: correctly handle truncated file 2010-04-17 10:23:59 -07:00
command-list.txt Add git-http-backend to command-list. 2009-12-26 14:12:34 -08:00
commit.c Merge branch 'maint-1.6.5' into maint 2010-01-29 23:36:13 -08:00
commit.h pretty: Initialize notes if %N is used 2010-04-13 18:15:08 -07:00
config.c Merge branch 'jc/ident' 2010-01-20 14:39:52 -08:00
config.mak.in Make NO_PTHREADS the sole thread configuration variable 2010-01-31 11:50:50 -08:00
configure.ac Gitweb: add autoconfigure support for minifiers 2010-04-02 21:23:38 -07:00
connect.c Merge branch 'fl/askpass' 2010-03-20 11:29:35 -07:00
convert.c Merge branch 'sp/maint-push-sideband' into maint 2010-03-02 22:54:50 -08:00
copy.c preserve mtime of local clone 2009-09-13 01:32:26 -07:00
COPYING Update COPYING with GPLv2 with new FSF address 2010-01-17 14:29:37 -08:00
csum-file.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -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 'bc/maint-daemon-sans-ss-family' into maint 2010-04-09 22:22:00 -07:00
date.c Merge branch 'jc/maint-reflog-bad-timestamp' 2010-01-27 14:57:37 -08: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 Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
diff-lib.c Merge branch 'jl/submodule-diff-dirtiness' 2010-03-24 16:25:43 -07:00
diff-no-index.c diff --no-index: make the usage string less scary 2009-11-10 12:00:21 -08:00
diff.c Merge branch 'jk/maint-diffstat-overflow' into maint 2010-04-22 22:29:13 -07:00
diff.h git status: ignoring untracked files must apply to submodules too 2010-03-13 21:56:35 -08:00
diffcore-break.c diffcore-break: save cnt_data for other phases 2009-11-16 13:21:12 -08:00
diffcore-delta.c Fix diff -B/--dirstat miscounting of newly added contents 2009-12-05 10:54:17 -08:00
diffcore-order.c
diffcore-pickaxe.c pickaxe: count regex matches only once 2009-03-21 23:18:53 -07:00
diffcore-rename.c diffcore-rename: reduce memory footprint by freeing blob data early 2009-11-20 22:13:47 -08:00
diffcore.h git diff --submodule: Show detailed dirty status of submodules 2010-03-04 22:16:33 -08:00
dir.c Merge branch 'jk/maint-add-ignored-dir' into maint 2010-03-24 16:24:03 -07:00
dir.h Merge branch 'nd/sparse' 2010-01-13 11:58:34 -08:00
editor.c editor: use run_command's shell feature 2010-01-05 23:41:51 -08:00
entry.c Merge branch 'jc/symbol-static' 2010-01-20 14:37:25 -08:00
environment.c Refactor list of of repo-local env vars 2010-02-24 16:24:25 -08:00
exec_cmd.c Print RUNTIME_PREFIX warning only when GIT_TRACE is set 2010-02-23 13:20:15 -08: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 fast-import: Improve robustness when D->F changes provided in wrong order 2010-07-09 16:16:47 -07:00
fetch-pack.h Smart fetch over HTTP: client side 2009-11-04 17:58:15 -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 Allow the Unix epoch to be a valid commit date 2009-07-06 09:36:16 -07:00
fsck.h Check the format of more printf-type functions 2009-11-15 18:24:58 -08: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 'jk/maint-add--interactive-delete' into maint 2010-03-08 00:36:00 -08:00
git-am.sh Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
git-archimport.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-bisect.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-compat-util.h Merge branch 'jn/merge-diff3-label' 2010-04-03 12:28:41 -07:00
git-cvsexportcommit.perl Avoid generating a warning if $fullname{$file} is undefined 2009-07-06 09:36:43 -07:00
git-cvsimport.perl cvsimport: new -R option: generate .git/cvs-revisions mapping 2010-02-06 11:01:59 -08:00
git-cvsserver.perl Merge branch 'gp/maint-cvsserver' 2010-01-28 00:46:33 -08:00
git-difftool--helper.sh Make difftool.prompt fall back to mergetool.prompt 2010-01-22 15:57:45 -08:00
git-difftool.perl difftool: Fix '--gui' when diff.guitool is unconfigured 2010-03-28 09:29:12 -07:00
git-filter-branch.sh Merge branch 'maint' 2010-02-11 23:06:32 -08:00
git-instaweb.sh git-instaweb: pass through invoking user's path to gitweb CGI scripts 2010-04-17 12:40:20 -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 octopus: remove dead code 2009-12-13 23:40:24 -08:00
git-merge-one-file.sh Show usage string for 'git merge-one-file -h' 2009-11-10 11:06:57 -08:00
git-merge-resolve.sh Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-mergetool--lib.sh add shebang line to git-mergetool--lib.sh 2010-01-29 09:56:51 -08: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 Do not install shell libraries executable 2010-01-31 11:53:10 -08:00
git-pull.sh Merge branch 'maint' 2010-03-20 11:29:19 -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-interactive: silence warning when no commits rewritten 2010-04-18 11:41:53 -07:00
git-rebase.sh Merge branch 'mb/rebase-i-no-ff' 2010-04-03 12:28:44 -07:00
git-relink.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-repack.sh Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
git-request-pull.sh request-pull: avoid mentioning that the start point is a single commit 2010-01-29 22:26:39 -08:00
git-send-email.perl Merge branch 'mg/maint-send-email-lazy-editor' into maint 2010-04-09 22:23:04 -07:00
git-sh-setup.sh Merge branch 'gb/maint-submodule-env' into maint 2010-03-08 00:36:02 -08:00
git-stash.sh Improve error messages from 'git stash show' 2010-03-16 19:23:24 -07:00
git-submodule.sh Merge branch 'jh/maint-submodule-status-in-void' 2010-03-24 16:55:37 -07:00
git-svn.perl Merge branch 'fl/askpass' 2010-03-20 11:29:35 -07:00
GIT-VERSION-GEN Git 1.7.1 2010-04-23 18:27:17 -07:00
git-web--browse.sh web--browse: fix Mac OS X GUI detection for 10.6 2009-09-14 02:27:25 -07:00
git.c Merge branch 'jh/notes' 2010-03-15 00:52:06 -07:00
git.spec.in RPM spec: include bash completion support 2010-03-29 09:40:06 -07:00
graph.c Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_* 2010-03-07 11:09:02 -08:00
graph.h Documentation: undocument gc'd function graph_release() 2009-11-19 23:05:17 -08:00
grep.c Merge branch 'rs/threaded-grep-context' 2010-04-03 12:28:39 -07:00
grep.h Merge branch 'ml/color-grep' 2010-03-20 11:29:36 -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 Remove hyphen from "git-command" in two error messages 2010-02-15 18:20:54 -08:00
help.h Merge branch 'ar/autospell' 2008-09-07 23:52:16 -07:00
hex.c slim down "git show-index" 2010-01-21 20:03:45 -08:00
http-backend.c http-backend: Don't infinite loop during die() 2010-03-24 14:40:56 -07:00
http-fetch.c http: init and cleanup separately from http-walker 2010-03-02 11:10:36 -08:00
http-push.c http-push: remove "|| 1" to enable verbose check 2010-03-02 11:10:36 -08:00
http-walker.c http: init and cleanup separately from http-walker 2010-03-02 11:10:36 -08:00
http.c git-core: Support retrieving passwords with GIT_ASKPASS 2010-03-04 22:05:13 -08:00
http.h http.c: mark file-local functions static 2010-01-12 01:06:08 -08:00
ident.c ident.c: replace fprintf with fputs to suppress compiler warning 2010-01-19 15:25:38 -08:00
imap-send.c Merge branch 'rr/imap-send-unconfuse-from-line' 2010-04-03 12:28:42 -07:00
INSTALL INSTALL: document a simpler way to run uninstalled builds 2009-12-03 11:38:21 -08:00
levenshtein.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
levenshtein.h Typofixes outside documentation area 2010-02-03 21:28:17 -08: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 ll_merge(): add ancestor label parameter for diff3-style output 2010-03-20 20:36:11 -07:00
ll-merge.h ll_merge(): add ancestor label parameter for diff3-style output 2010-03-20 20:36:11 -07:00
lockfile.c lockfile: show absolute filename in unable_to_lock_message 2010-01-12 15:48:24 -08:00
log-tree.c git log -p -m: document -m and honor --first-parent 2010-02-12 11:32:23 -08:00
log-tree.h git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
mailmap.c mailmap.c: remove unused function 2010-01-12 01:06:09 -08:00
mailmap.h mailmap.c: remove unused function 2010-01-12 01:06:09 -08:00
Makefile Merge branch 'da/maint-python-startup' into maint 2010-04-22 22:29:07 -07:00
match-trees.c Make "subtree" part more orthogonal to the rest of merge-recursive. 2010-01-17 22:46:28 -08:00
merge-file.c merge_file(): add comment explaining behavior wrt conflict style 2010-03-20 20:36:11 -07:00
merge-recursive.c merge-recursive: Fix multiple file rename across D/F conflict 2010-08-18 12:08:08 -07:00
merge-recursive.h merge_trees(): add ancestor label parameter for diff3-style output 2010-03-20 20:36:11 -07:00
name-hash.c Make hash_name_lookup able to do case-independent lookups 2008-04-09 01:22:25 -07:00
notes.c Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
notes.h notes.h: declare bit field as unsigned to silence compiler complaints 2010-04-06 21:55:50 -07:00
object.c object.c: remove unused functions 2010-01-17 22:49:36 -08:00
object.h object.c: remove unused functions 2010-01-17 22:49:36 -08:00
pack-check.c Don't expect verify_pack() callers to set pack_size 2009-06-06 10:56:27 -07:00
pack-refs.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack-refs.h Move pack_refs() and friends into libgit 2008-06-19 15:53:13 -07:00
pack-revindex.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
pack-revindex.h discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-write.c move encode_in_pack_object_header() to a better place 2010-02-23 13:10:56 -08:00
pack.h move encode_in_pack_object_header() to a better place 2010-02-23 13:10:56 -08:00
pager.c Make 'git var GIT_PAGER' always print the configured pager 2010-02-14 18:23:17 -08:00
parse-options.c parse-options: add parse_options_concat() to concat options 2010-03-06 23:58:33 -08:00
parse-options.h parse-options: add parse_options_concat() to concat options 2010-03-06 23:58:33 -08:00
patch-delta.c Fix integer overflow in patch_delta() 2010-01-26 12:57:59 -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 Merge branch 'mm/mkstemps-mode-for-packfiles' into maint 2010-03-08 00:36:00 -08:00
pkt-line.c pkt-line: Make packet_read_line easier to debug 2009-10-30 19:20:53 -07:00
pkt-line.h pkt-line: Add strbuf based functions 2009-10-30 19:20:53 -07:00
preload-index.c Make ce_uptodate() trustworthy again 2010-01-24 00:15:29 -08:00
pretty.c pretty: Initialize notes if %N is used 2010-04-13 18:15:08 -07:00
progress.c change throughput display units with fast links 2009-10-14 01:19:29 -07:00
progress.h nicer display of thin pack completion 2007-11-08 15:43:41 -08:00
quote.c Fix invalid read in quote_c_style_counted 2010-02-06 10:55:03 -08:00
quote.h quote.c: mark file-local function static 2010-01-12 01:06:08 -08:00
reachable.c process_{tree,blob}: Remove useless xstrdup calls 2009-04-08 22:58:43 -07:00
reachable.h
read-cache.c Correct spelling of 'REUC' extension 2010-02-02 09:54:34 -08:00
README README: git lives at http://git-scm.com these days 2009-10-07 12:47:24 -07:00
reflog-walk.c Introduce new pretty formats %g[sdD] for reflog information 2009-10-19 22:28:26 -07:00
reflog-walk.h Introduce new pretty formats %g[sdD] for reflog information 2009-10-19 22:28:26 -07:00
refs.c Merge branch 'jc/maint-refs-dangling' into maint 2010-03-31 15:09:32 -07:00
refs.h Support showing notes from more than one notes tree 2010-03-12 21:55:39 -08:00
RelNotes Git 1.7.0.6 2010-04-22 23:04:21 -07:00
remote-curl.c Merge branch 'tc/http-cleanup' 2010-03-15 00:58:50 -07:00
remote.c refactor ref status logic for pushing 2010-01-09 23:34:10 -08:00
remote.h refactor ref status logic for pushing 2010-01-09 23:34:10 -08:00
replace_object.c environment: add global variable to disable replacement 2009-05-31 17:02:59 -07:00
rerere.c ll_merge(): add ancestor label parameter for diff3-style output 2010-03-20 20:36:11 -07:00
rerere.h Merge branch 'jc/cache-unmerge' 2010-01-20 14:46:35 -08:00
resolve-undo.c build: make code "-Wpointer-arith" clean 2010-02-01 22:04:03 -08:00
resolve-undo.h build: make code "-Wpointer-arith" clean 2010-02-01 22:04:03 -08:00
revision.c Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
revision.h Merge branch 'tr/notes-display' 2010-03-24 16:26:43 -07:00
run-command.c Merge branch 'jl/maint-submodule-gitfile-awareness' 2010-04-11 13:54:28 -07:00
run-command.h Merge branch 'sp/maint-push-sideband' into maint 2010-03-02 22:54:50 -08:00
send-pack.h git-push: make git push --porcelain print "Done" 2010-02-28 10:39:30 -08:00
server-info.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
setup.c Merge branch 'nd/root-git' 2010-03-07 12:47:15 -08:00
sha1_file.c fix const-correctness of write_sha1_file 2010-04-01 23:49:03 -07:00
sha1_name.c sha1_name: fix segfault caused by invalid index access 2010-02-28 10:32:06 -08: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
shallow.c Merge branch 'mk/maint-parse-careful' 2008-02-18 20:56:01 -08:00
shell.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
shortlog.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
show-index.c slim down "git show-index" 2010-01-21 20:03:45 -08:00
sideband.c Smart push over HTTP: client side 2009-11-04 17:58:15 -08: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 Merge branch 'ap/merge-backend-opts' 2010-01-20 20:28:50 -08:00
strbuf.h Merge branch 'jc/maint-strbuf-add-fix-doubling' 2010-01-20 14:43:09 -08:00
string-list.c string-list: add unsorted_string_list_lookup() 2010-03-24 19:41:19 -07:00
string-list.h string-list: add unsorted_string_list_lookup() 2010-03-24 19:41:19 -07:00
submodule.c Teach diff --submodule and status to handle .git files in submodules 2010-04-10 11:51:56 -07:00
submodule.h git status: ignoring untracked files must apply to submodules too 2010-03-13 21:56:35 -08:00
symlinks.c symlinks.c: remove unused functions 2010-01-17 22:49:36 -08:00
tag.c Merge branch 'mk/maint-parse-careful' 2008-03-02 15:11:07 -08:00
tag.h
tar.h
test-chmtime.c Typofixes outside documentation area 2010-02-03 21:28:17 -08:00
test-ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
test-date.c refactor test-date interface 2009-08-30 22:04:46 -07:00
test-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -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: ensure stdout is set to _O_BINARY on Windows 2009-09-21 00:36:12 -07:00
test-index-version.c Add test-index-version 2009-08-23 17:11:28 -07:00
test-match-trees.c
test-parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
test-path-utils.c Introduce the function strip_path_suffix() 2009-02-19 22:45:48 -08:00
test-run-command.c start_command: detect execvp failures early 2010-01-10 10:15:03 -08:00
test-sha1.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -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 Make usage of windows.h lean and mean 2009-09-18 20:00:42 -07: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-helper.c Merge branch 'tc/transport-verbosity' 2010-03-15 00:58:42 -07:00
transport.c Merge branch 'tc/transport-verbosity' 2010-03-15 00:58:42 -07:00
transport.h Merge branch 'tc/transport-verbosity' 2010-03-15 00:58:42 -07:00
tree-diff.c Performance optimization for detection of modified submodules 2010-01-18 17:28:21 -08:00
tree-walk.c Merge branch 'maint-1.6.6' into maint 2010-02-14 18:59:14 -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-trees.c Merge branch 'jc/fix-tree-walk' 2010-01-24 17:35:58 -08:00
unpack-trees.h Merge branch 'jc/fix-tree-walk' 2010-01-24 17:35:58 -08:00
upload-pack.c run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
usage.c Fix truncated usage messages 2009-11-22 16:14:48 -08:00
userdiff.c git_attr(): fix function signature 2010-01-16 20:39:59 -08:00
userdiff.h color-words: make regex configurable via attributes 2009-01-17 10:44:21 -08:00
utf8.c Merge branch 'rs/optim-text-wrap' into maint 2010-03-04 22:26:33 -08:00
utf8.h Merge branch 'rs/optim-text-wrap' into maint 2010-03-04 22:26:33 -08:00
walker.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
walker.h http: init and cleanup separately from http-walker 2010-03-02 11:10:36 -08:00
wrap-for-bin.sh wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR 2010-03-02 16:27:03 -08:00
wrapper.c Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. 2010-02-22 15:24:46 -08:00
write_or_die.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
ws.c git_attr(): fix function signature 2010-01-16 20:39:59 -08:00
wt-status.c Merge branch 'jl/submodule-diff-dirtiness' 2010-03-24 16:25:43 -07:00
wt-status.h git status: Show detailed dirty status of submodules in long format 2010-03-08 15:49:23 -08:00
xdiff-interface.c refactor duplicated fill_mm() in checkout and merge-recursive 2010-02-17 15:11:33 -08:00
xdiff-interface.h refactor duplicated fill_mm() in checkout and merge-recursive 2010-02-17 15:11:33 -08: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-scm.com/
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.