A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Junio C Hamano 5a4d707a6d Merge branch 'db/checkout'
* db/checkout: (21 commits)
  checkout: error out when index is unmerged even with -m
  checkout: show progress when checkout takes long time while switching branches
  Add merge-subtree back
  checkout: updates to tracking report
  builtin-checkout.c: Remove unused prefix arguments in switch_branches path
  checkout: work from a subdirectory
  checkout: tone down the "forked status" diagnostic messages
  Clean up reporting differences on branch switch
  builtin-checkout.c: fix possible usage segfault
  checkout: notice when the switched branch is behind or forked
  Build in checkout
  Move code to clean up after a branch change to branch.c
  Library function to check for unmerged index entries
  Use diff -u instead of diff in t7201
  Move create_branch into a library file
  Build-in merge-recursive
  Add "skip_unmerged" option to unpack_trees.
  Discard "deleted" cache entries after using them to update the working tree
  Send unpack-trees debugging output to stderr
  Add flag to make unpack_trees() not print errors.
  ...

Conflicts:

	Makefile
2008-02-27 12:53:26 -08:00
Documentation Merge branch 'db/cover-letter' 2008-02-27 12:06:41 -08:00
arm War on whitespace 2007-06-07 00:04:01 -07:00
compat Merge branch 'bc/fopen' 2008-02-20 16:13:19 -08:00
contrib Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
git-gui Sync with 1.5.4.3 2008-02-23 11:49:34 -08:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2008-02-16 17:41:38 -08:00
gitweb gitweb: Better cutting matched string and its context 2008-02-25 22:20:18 -08:00
mozilla-sha1 War on whitespace 2007-06-07 00:04:01 -07:00
perl Don't cache DESTDIR in perl/perl.mak. 2007-12-11 00:38:46 -08:00
ppc War on whitespace 2007-06-07 00:04:01 -07:00
t Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
templates git-commit: add a prepare-commit-msg hook 2008-02-06 02:26:55 -08:00
xdiff xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM 2008-02-18 00:10:37 -08:00
.gitattributes Define the project whitespace policy 2008-02-11 13:23:15 -08:00
.gitignore Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...) 2008-02-09 23:27:09 -08:00
.mailmap Sync with 1.5.4.2 and start 1.5.5 Release Notes 2008-02-17 01:51:46 -08:00
COPYING
GIT-VERSION-GEN Sync with 1.5.4.3 2008-02-23 11:49:34 -08:00
INSTALL INSTALL: git-merge no longer uses cpio 2008-02-05 23:31:17 -08:00
Makefile Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
README Update README to point at a few key periodical messages to the list 2007-03-25 17:42:32 -07:00
RelNotes GIT 1.5.4.3 2008-02-23 11:31:04 -08:00
alias.c make alias lookup a public, procedural function 2008-02-24 18:31:49 -08:00
alloc.c Clean up object creation to use more common code 2007-04-16 23:36:16 -07:00
archive-tar.c archive-tar.c: guard config parser from value=NULL 2008-02-11 13:11:36 -08:00
archive-zip.c preserve executable bits in zip archives 2007-09-18 14:56:55 -07:00
archive.c Move sha1_file_to_archive into libgit 2008-01-18 12:33:50 -08:00
archive.h archive: specfile support (--pretty=format: in archive files) 2007-09-03 16:46:16 -07:00
attr.c gitattributes: fix relative path matching 2008-02-07 00:04:50 -08:00
attr.h Fix funny types used in attribute value representation 2007-04-18 16:17:13 -07:00
base85.c decode_85(): fix missing return. 2007-05-30 15:03:50 -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 Move code to clean up after a branch change to branch.c 2008-02-09 23:16:51 -08:00
branch.h Move code to clean up after a branch change to branch.c 2008-02-09 23:16:51 -08:00
builtin-add.c git-add: adjust to the get_pathspec() changes. 2008-02-05 00:44:10 -08:00
builtin-annotate.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-apply.c Merge branch 'jc/apply-whitespace' 2008-02-24 17:23:17 -08:00
builtin-archive.c Move sha1_file_to_archive into libgit 2008-01-18 12:33:50 -08:00
builtin-blame.c Merge branch 'jc/setup' 2008-02-20 16:13:16 -08:00
builtin-branch.c Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
builtin-bundle.c bundle create: keep symbolic refs' names instead of resolving them 2007-11-22 15:15:25 -08:00
builtin-cat-file.c Cleanup variables in cat-file 2007-04-22 00:43:24 -07:00
builtin-check-attr.c Full rework of quote_c_style and write_name_quoted. 2007-09-20 23:45:49 -07:00
builtin-check-ref-format.c
builtin-checkout-index.c Improve use of lockfile API 2008-01-16 15:35:35 -08:00
builtin-checkout.c checkout: error out when index is unmerged even with -m 2008-02-24 00:36:31 -08:00
builtin-clean.c git-clean: handle errors if removing files fails 2008-02-20 20:21:39 -08:00
builtin-commit-tree.c Re-fix "builtin-commit: fix --signoff" 2007-12-09 00:55:55 -08:00
builtin-commit.c Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
builtin-config.c Merge branch 'jk/noetcconfig' 2008-02-16 17:56:51 -08:00
builtin-count-objects.c Make builtin-count-objects.c use parse_options. 2007-10-29 21:03:31 -07:00
builtin-describe.c Teach git-describe --exact-match to avoid expensive tag searches 2008-02-24 10:01:24 -08:00
builtin-diff-files.c add a "basic" diff config callback 2008-01-04 16:05:23 -08:00
builtin-diff-index.c add a "basic" diff config callback 2008-01-04 16:05:23 -08:00
builtin-diff-tree.c add a "basic" diff config callback 2008-01-04 16:05:23 -08:00
builtin-diff.c Merge branch 'jc/diff-relative' 2008-02-27 11:55:28 -08:00
builtin-fast-export.c Merge branch 'maint' 2008-02-26 00:14:22 -08:00
builtin-fetch--tool.c Error out when user doesn't have access permission to the repository 2007-11-30 13:10:11 -08:00
builtin-fetch-pack.c start_command(), .in/.out/.err = -1: Callers must close the file descriptor 2008-02-23 11:59:44 -08:00
builtin-fetch.c Reduce the number of connects when fetching 2008-02-05 00:40:18 -08:00
builtin-fmt-merge-msg.c check return code of prepare_revision_walk 2008-02-17 23:51:12 -08:00
builtin-for-each-ref.c builtin-for-each-ref.c: fix typo in error message 2008-02-24 18:34:34 -08:00
builtin-fsck.c Merge branch 'lt/in-core-index' 2008-02-11 16:46:20 -08:00
builtin-gc.c builtin-gc.c: guard config parser from value=NULL 2008-02-11 13:11:36 -08:00
builtin-grep.c Teach git-grep --name-only as synonym for -l 2008-02-20 20:36:20 -08:00
builtin-http-fetch.c http-push and http-fetch: handle URLs without trailing / 2008-01-20 15:18:34 -08:00
builtin-init-db.c Merge branch 'maint' 2008-02-26 00:14:22 -08:00
builtin-log.c Merge branch 'db/cover-letter' 2008-02-27 12:06:41 -08:00
builtin-ls-files.c Merge branch 'jc/setup' 2008-02-20 16:13:16 -08:00
builtin-ls-remote.c Reduce the number of connects when fetching 2008-02-05 00:40:18 -08:00
builtin-ls-tree.c Full rework of quote_c_style and write_name_quoted. 2007-09-20 23:45:49 -07:00
builtin-mailinfo.c mailinfo: feed only one line to handle_filter() for QP input 2008-02-15 22:16:34 -08:00
builtin-mailsplit.c Merge branch 'maint' 2007-11-09 00:21:44 -08:00
builtin-merge-base.c Make every builtin-*.c file #include "builtin.h" 2007-07-14 22:44:09 -07:00
builtin-merge-file.c xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM 2008-02-18 00:10:37 -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 Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
builtin-mv.c builtin-mv: minimum fix to avoid losing files 2008-02-05 00:44:10 -08:00
builtin-name-rev.c git-name-rev: add a --(no-)undefined option. 2007-12-26 15:59:31 -08:00
builtin-pack-objects.c Revert "pack-objects: Print a message describing the number of threads for packing" 2008-02-26 23:27:31 -08:00
builtin-pack-refs.c Improve use of lockfile API 2008-01-16 15:35:35 -08:00
builtin-prune-packed.c return the prune-packed progress display to the inner loop 2007-11-01 15:22:32 -07:00
builtin-prune.c Make git prune remove temporary packs that look like write failures 2008-02-11 12:22:58 -08:00
builtin-push.c Resolve value supplied for no-colon push refspecs 2008-02-20 11:06:27 -08:00
builtin-read-tree.c Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
builtin-reflog.c builtin-reflog.c: don't install new reflog on write failure 2008-02-22 22:52:06 -08:00
builtin-rerere.c Merge branch 'maint' 2008-02-26 00:14:22 -08:00
builtin-reset.c Move code to clean up after a branch change to branch.c 2008-02-09 23:16:51 -08:00
builtin-rev-list.c Merge branch 'lt/revision-walker' 2008-02-20 16:13:24 -08:00
builtin-rev-parse.c rev-parse: fix potential bus error with --parseopt option spec handling 2008-02-25 21:40:12 -08:00
builtin-revert.c Make error messages from cherry-pick/revert more sensible 2008-02-05 00:39:19 -08:00
builtin-rm.c Improve use of lockfile API 2008-01-16 15:35:35 -08:00
builtin-send-pack.c start_command(), if .in/.out > 0, closes file descriptors, not the callers 2008-02-23 11:59:44 -08:00
builtin-shortlog.c Add API access to shortlog 2008-02-25 19:57:06 -08:00
builtin-show-branch.c builtin-show-branch.c: guard config parser from value=NULL 2008-02-11 13:11:36 -08:00
builtin-show-ref.c deref_tag: handle return value NULL 2008-02-17 23:46:55 -08:00
builtin-stripspace.c Clean up stripspace a bit, use strbuf even more. 2007-09-27 00:33:33 -07:00
builtin-symbolic-ref.c Make builtin-symbolic-ref.c use parse_options. 2007-10-29 21:03:31 -07:00
builtin-tag.c start_command(), .in/.out/.err = -1: Callers must close the file descriptor 2008-02-23 11:59:44 -08:00
builtin-tar-tree.c prefixcmp(): fix-up mechanical conversion. 2007-02-20 22:03:15 -08:00
builtin-unpack-objects.c relax usage of the progress API 2007-10-30 16:08:40 -07:00
builtin-update-index.c Make on-disk index representation separate from in-core one 2008-01-21 12:44:31 -08:00
builtin-update-ref.c Make builtin-update-ref.c use parse_options 2007-10-29 21:03:31 -07:00
builtin-upload-archive.c short i/o: fix calls to read to use xread or read_in_full 2007-01-08 15:44:47 -08:00
builtin-verify-pack.c Load core configuration in git-verify-pack. 2006-12-29 11:36:45 -08:00
builtin-verify-tag.c start_command(), if .in/.out > 0, closes file descriptors, not the callers 2008-02-23 11:59:44 -08:00
builtin-write-tree.c Make error messages from cherry-pick/revert more sensible 2008-02-05 00:39:19 -08:00
builtin.h Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
bundle.c start_command(), if .in/.out > 0, closes file descriptors, not the callers 2008-02-23 11:59:44 -08:00
bundle.h Move bundle specific stuff into bundle.[ch] 2007-09-19 03:22:30 -07:00
cache-tree.c Merge branch 'jc/error-message-in-cherry-pick' 2008-02-11 16:46:27 -08:00
cache-tree.h Make error messages from cherry-pick/revert more sensible 2008-02-05 00:39:19 -08:00
cache.h Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
check-builtins.sh cherry is built-in, do not ship git-cherry.sh 2006-11-05 11:26:21 -08:00
check-racy.c ce_match_stat, run_diff_files: use symbolic constants for readability 2007-11-10 00:24:51 -08:00
color.c Add color.ui variable which globally enables colorization if set 2008-02-18 00:00:38 -08:00
color.h Add color.ui variable which globally enables colorization if set 2008-02-18 00:00:38 -08:00
combine-diff.c Fix rewrite_diff() name quoting. 2007-12-26 17:13:36 -08:00
command-list.txt Officially deprecate repo-config. 2008-01-17 22:52:40 -08:00
commit.c check return value from parse_commit() in various functions 2008-02-18 20:49:13 -08:00
commit.h Export some email and pretty-printing functions 2008-02-19 00:56:46 -08:00
config.c git_config_*: don't assume we are parsing a config file 2008-02-20 20:21:43 -08:00
config.mak.in autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>. 2008-01-25 22:26:08 -08:00
configure.ac autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>. 2008-01-25 22:26:08 -08:00
connect.c Merge branch 'db/no-separate-ls-remote-connection' (early part) 2008-02-11 16:47:07 -08:00
convert.c Merge branch 'sp/safecrlf' 2008-02-16 17:59:20 -08:00
copy.c Use a single implementation and API for copy_file() 2008-02-25 13:06:49 -08:00
csum-file.c remove dead code from the csum-file interface 2007-11-05 12:55:33 -08:00
csum-file.h remove dead code from the csum-file interface 2007-11-05 12:55:33 -08:00
ctype.c War on whitespace 2007-06-07 00:04:01 -07:00
daemon.c Style: place opening brace of a function definition at column 1 2007-11-08 15:35:32 -08:00
date.c timezone_names[]: fixed the tz offset for New Zealand. 2008-02-25 21:56:10 -08:00
decorate.c Fix a copy-n-paste bug in the object decorator code. 2007-04-20 19:16:12 -07:00
decorate.h Add a generic "object decorator" interface, and make object refs use it 2007-04-16 16:51:09 -07:00
delta.h Support fetching the memory usage of a delta index 2007-07-12 14:32:35 -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 Allow callers of unpack_trees() to handle failure 2008-02-09 23:16:51 -08:00
diff.c Merge branch 'jc/diff-relative' 2008-02-27 11:55:28 -08:00
diff.h Merge branch 'jc/diff-relative' 2008-02-27 11:55:28 -08:00
diffcore-break.c rename: Break filepairs with different types. 2007-12-02 02:24:46 -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 War on whitespace 2007-06-07 00:04:01 -07:00
diffcore-rename.c Fix a pathological case in git detecting proper renames 2007-11-30 15:49:17 -08:00
diffcore.h copy vs rename detection: avoid unnecessary O(n*m) loops 2007-10-26 23:18:06 -07:00
dir.c Merge branch 'jc/gitignore-ends-with-slash' 2008-02-16 17:57:06 -08:00
dir.h gitignore: lazily find dtype 2008-02-05 00:46:49 -08:00
dump-cache-tree.c
entry.c Make on-disk index representation separate from in-core one 2008-01-21 12:44:31 -08:00
environment.c Merge branch 'sp/safecrlf' 2008-02-16 17:59:20 -08:00
exec_cmd.c Trace and quote with argv: get rid of unneeded count argument. 2007-12-03 22:11:53 -08:00
exec_cmd.h use only the $PATH for exec'ing git commands 2007-10-29 20:51:37 -07:00
fast-import.c Finish current packfile during fast-import crash handler 2008-02-16 00:47:07 -08:00
fetch-pack.h Reduce the number of connects when fetching 2008-02-05 00:40:18 -08:00
fixup-builtins Start deprecating "git-command" in favor of "git command" 2007-07-02 22:39:10 -07:00
generate-cmdlist.sh Consolidate command list to one. 2007-12-01 23:48:28 -08:00
git-add--interactive.perl add--interactive: handle initial commit better 2008-02-16 01:02:44 -08:00
git-am.sh git-am: fix type in its usage string 2008-02-03 16:01:27 -08:00
git-archimport.perl Make git-archimport log entries more consistent 2007-08-30 19:22:02 -07:00
git-bisect.sh Eliminate confusing "won't bisect on seeked tree" failure 2008-02-24 17:41:33 -08:00
git-clone.sh git-clone.sh: properly configure remote even if remote's head is dangling 2008-02-20 11:31:17 -08:00
git-compat-util.h Merge branch 'bc/fopen' 2008-02-20 16:13:19 -08:00
git-cvsexportcommit.perl Merge branch 'js/maint-cvsexport' 2008-02-20 16:13:52 -08:00
git-cvsimport.perl cvsimport: have default merge regex also match beginning of commit message 2008-02-13 14:22:54 -08:00
git-cvsserver.perl cvsserver: Fix for histories with multiple roots 2008-01-26 17:58:18 -08:00
git-filter-branch.sh filter-branch: handle filenames that need quoting 2008-02-15 23:57:26 -08:00
git-instaweb.sh instaweb: use 'git-web--browse' to launch browser. 2008-02-05 01:01:49 -08:00
git-lost-found.sh Merge branch 'ph/parseopt-sh' 2007-11-17 21:39:37 -08:00
git-merge-octopus.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
git-merge-one-file.sh Support a merge with conflicting gitlink change 2007-12-11 00:40:56 -08:00
git-merge-resolve.sh Fixing comment in merge strategies 2007-08-30 17:18:22 -07:00
git-merge-stupid.sh Fixing comment in merge strategies 2007-08-30 17:18:22 -07:00
git-merge.sh Merge branch 'ph/parseopt-sh' 2007-11-17 21:39:37 -08:00
git-mergetool.sh Allow git-mergetool to handle paths with a leading space 2008-01-07 21:00:54 -08:00
git-parse-remote.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
git-pull.sh pull: pass --strategy along to to rebase 2008-02-22 21:44:46 -08:00
git-quiltimport.sh Replace instances of export VAR=VAL with VAR=VAL; export VAR 2007-11-28 17:23:18 -08:00
git-rebase--interactive.sh rebase -i: accept -m as advertised in the man page 2008-02-11 12:18:53 -08:00
git-rebase.sh Merge branch 'maint' 2007-11-28 17:06:57 -08:00
git-relink.perl git-relink: avoid hard linking in objects/info directory 2008-01-30 00:01:27 -08:00
git-remote.perl Make git-remote.perl "use strict" compliant 2008-02-06 13:50:21 -08:00
git-repack.sh Migrate git-repack.sh to use git-rev-parse --parseopt 2007-11-05 22:48:13 -08:00
git-request-pull.sh Merge branch 'ph/parseopt-sh' 2007-11-17 21:39:37 -08:00
git-send-email.perl send-email: fix In-Reply-To regression 2008-02-21 21:25:49 -08:00
git-sh-setup.sh Simplify setup of $GIT_DIR in git-sh-setup.sh 2008-02-18 21:53:44 -08:00
git-stash.sh git-stash clear: refuse to work with extra parameter for now 2008-01-06 18:41:36 -08:00
git-submodule.sh git-submodule: fix subcommand parser 2008-01-20 20:57:42 -08:00
git-svn.perl Add `git svn blame' command 2008-02-11 13:23:14 -08:00
git-web--browse.sh Merge branch 'cc/browser' 2008-02-16 17:57:47 -08:00
git.c Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
git.spec.in Rename git-core rpm to just git and rename the meta-pacakge to git-all. 2008-02-19 22:17:22 -08:00
grep.c Move buffer_is_binary() to xdiff-interface.h 2007-06-15 23:27:23 -07:00
grep.h grep --all-match 2006-09-27 23:59:09 -07:00
hash-object.c hash-object: cleanup handling of command line options 2008-02-22 09:32:49 -08:00
hash.c hash: fix lookup_hash semantics 2008-02-22 13:39:20 -08:00
hash.h Do linear-time/space rename logic for exact renames 2007-10-26 23:18:06 -07:00
help.c help: respect aliases 2008-02-24 18:31:50 -08:00
http-push.c Merge branch 'js/maint-http-push' 2008-02-20 16:13:32 -08:00
http-walker.c Move fetch_ref from http-push.c and http-walker.c to http.c 2007-12-14 21:31:59 -08:00
http.c http.c: guard config parser from value=NULL 2008-02-11 13:11:37 -08:00
http.h Clarify that http-push being temporarily disabled with older cURL 2008-01-22 00:48:29 -08:00
ident.c Fix grammar nits in documentation and in code comments. 2008-01-03 09:15:17 -08:00
imap-send.c imap-send.c: guard config parser from value=NULL 2008-02-11 13:14:25 -08:00
index-pack.c Merge branch 'np/progress' 2007-11-14 14:04:19 -08:00
interpolate.c Merge branch 'mv/unknown' 2007-10-03 04:28:24 -07:00
interpolate.h Lift 16kB limit of log message output 2007-06-13 00:41:21 -07:00
list-objects.c list-objects.c::process_tree/blob: check for NULL 2008-02-18 19:25:26 -08:00
list-objects.h
lockfile.c close_lock_file(): new function in the lockfile API 2008-01-16 15:35:03 -08:00
log-tree.c Merge branch 'db/cover-letter' 2008-02-27 12:06:41 -08:00
log-tree.h Export some email and pretty-printing functions 2008-02-19 00:56:46 -08:00
mailmap.c mailmap: fix bogus for() loop that happened to be safe by accident 2007-12-08 03:40:12 -08:00
mailmap.h Split out mailmap handling out of shortlog 2007-04-29 02:05:06 -07:00
match-trees.c Improved const correctness for strings 2007-10-21 01:43:27 -04:00
merge-file.c xdl_diff: identify call sites. 2007-12-13 23:04:26 -08:00
merge-index.c git-merge-index documentation: clarify synopsis 2008-02-22 07:02:40 -08:00
merge-recursive.h Build-in merge-recursive 2008-02-09 23:16:51 -08:00
merge-tree.c xdl_diff: identify call sites. 2007-12-13 23:04:26 -08:00
mktag.c Now that cache.h needs strbuf.h, remove useless includes. 2007-09-16 17:30:03 -07:00
mktree.c Rework unquote_c_style to work on a strbuf. 2007-09-20 23:32:18 -07:00
object-refs.c War on whitespace 2007-06-07 00:04:01 -07:00
object.c parse_object_buffer: don't ignore errors from the object specific parsing functions 2008-02-03 16:04:57 -08:00
object.h War on whitespace 2007-06-07 00:04:01 -07:00
pack-check.c pack-check: Sort entries by pack offset before unpacking them. 2007-06-06 16:04:02 -07:00
pack-redundant.c War on whitespace 2007-06-07 00:04:01 -07:00
pack-write.c Merge branch 'np/progress' 2007-11-02 16:27:37 -07:00
pack.h Merge branch 'np/progress' 2007-11-02 16:27:37 -07:00
pager.c sending errors to stdout under $PAGER 2008-02-17 12:47:01 -08:00
parse-options.c parse-options: catch likely typo in presense of aggregated options. 2008-01-26 10:53:31 -08:00
parse-options.h parse-options: Allow to hide options from the default usage. 2007-11-22 22:11:28 -08:00
patch-delta.c make patch_delta() error cases a bit more verbose 2006-12-18 15:30:17 -08:00
patch-id.c War on whitespace 2007-06-07 00:04:01 -07:00
patch-ids.c Make the diff_options bitfields be an unsigned with explicit masks. 2007-11-11 16:54:15 -08: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-list.c path-list.c: always free strdup'ed paths 2007-08-15 13:43:08 -07:00
path-list.h path-list.c: always free strdup'ed paths 2007-08-15 13:43:08 -07:00
path.c Add is_absolute_path() and make_absolute_path() 2007-08-01 00:38:30 -07:00
pkt-line.c War on whitespace 2007-06-07 00:04:01 -07:00
pkt-line.h
pretty.c Merge branch 'db/cover-letter' 2008-02-27 12:06:41 -08:00
progress.c Flush progress message buffer in display(). 2007-11-20 13:16:15 -08:00
progress.h nicer display of thin pack completion 2007-11-08 15:43:41 -08:00
quote.c Fix rewrite_diff() name quoting. 2007-12-26 17:13:36 -08:00
quote.h Fix rewrite_diff() name quoting. 2007-12-26 17:13:36 -08:00
reachable.c Merge branch 'mk/maint-parse-careful' 2008-02-18 20:56:01 -08:00
reachable.h Move traversal of reachable objects into a separate library. 2007-01-06 22:57:34 -08:00
read-cache.c Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
receive-pack.c start_command(), .in/.out/.err = -1: Callers must close the file descriptor 2008-02-23 11:59:44 -08:00
reflog-walk.c git log -g: Complain, but do not fail, when no reflogs are there 2007-07-24 17:28:10 -07:00
reflog-walk.h git log -g: Complain, but do not fail, when no reflogs are there 2007-07-24 17:28:10 -07:00
refs.c Optimize peel_ref for the current ref of a for_each_ref callback 2008-02-24 10:01:24 -08:00
refs.h lock_any_ref_for_update(): reject wildcard return from check_ref_format 2008-01-02 02:28:54 -08:00
remote.c Merge branch 'db/push-single-with-HEAD' 2008-02-27 11:54:28 -08:00
remote.h Use ALLOC_GROW in remote.{c,h} 2008-02-19 01:04:32 -08:00
revision.c Merge branch 'jc/diff-relative' 2008-02-27 11:55:28 -08:00
revision.h Merge branch 'db/cover-letter' 2008-02-27 12:06:41 -08:00
run-command.c start_command(), if .in/.out > 0, closes file descriptors, not the callers 2008-02-23 11:59:44 -08:00
run-command.h start_command(), if .in/.out > 0, closes file descriptors, not the callers 2008-02-23 11:59:44 -08:00
send-pack.h Teach send-pack a mirror mode 2007-11-09 21:14:10 -08:00
server-info.c Don't access line[-1] for a zero-length "line" from fgets. 2008-01-04 12:28:58 -08:00
setup.c prefix_path: use is_absolute_path() instead of *orig == '/' 2008-02-20 20:21:43 -08:00
sha1_file.c Merge branch 'jk/empty-tree' 2008-02-20 16:13:28 -08:00
sha1_name.c Merge branch 'mk/maint-parse-careful' 2008-02-18 20:56:01 -08:00
shallow.c Merge branch 'mk/maint-parse-careful' 2008-02-18 20:56:01 -08:00
shell.c shell should call the new setup_path() to setup $PATH 2007-10-29 20:51:37 -07:00
shortlog.h Add API access to shortlog 2008-02-25 19:57:06 -08:00
show-index.c Use PRIuMAX instead of 'unsigned long long' in show-index 2007-10-21 02:16:57 -04:00
sideband.c recv_sideband: Do not use ANSI escape sequence on dumb terminals. 2008-01-09 12:23:59 -08:00
sideband.h atomic write for sideband remote messages 2006-10-11 11:13:01 -07:00
strbuf.c Avoid a useless prefix lookup in strbuf_expand() 2008-02-09 23:57:08 -08:00
strbuf.h Avoid a useless prefix lookup in strbuf_expand() 2008-02-09 23:57:08 -08:00
symlinks.c Add has_symlink_leading_path() function. 2007-05-11 22:11:07 -07:00
tag.c deref_tag: handle tag->tagged = NULL 2008-02-17 23:49:33 -08:00
tag.h
tar.h
test-absolute-path.c Add is_absolute_path() and make_absolute_path() 2007-08-01 00:38:30 -07:00
test-chmtime.c Add test-chmtime: a utility to change mtime on files 2007-02-25 11:09:56 -08:00
test-date.c simplify inclusion of system header files. 2006-12-20 09:51:35 -08:00
test-delta.c Fix compilation of test-delta 2007-05-01 02:59:08 -07:00
test-genrandom.c simple random data generator for tests 2007-04-11 19:23:32 -07:00
test-match-trees.c A new merge stragety 'subtree'. 2007-04-07 02:29:40 -07:00
test-parse-options.c parse-options: catch likely typo in presense of aggregated options. 2008-01-26 10:53:31 -08:00
test-sha1.c
test-sha1.sh the use of 'tr' in the test suite isn't really portable 2007-12-17 20:49:18 -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 and quote with argv: get rid of unneeded count argument. 2007-12-03 22:11:53 -08:00
transport.c Merge branch 'db/no-separate-ls-remote-connection' (early part) 2008-02-11 16:47:07 -08:00
transport.h Merge branch 'aw/mirror-push' into jk/send-pack 2007-11-14 03:13:30 -08:00
tree-diff.c Fix small memory leaks induced by diff_tree_setup_paths 2007-12-12 10:59:22 -08:00
tree-walk.c tree-walk: don't parse incorrect entries 2008-01-06 18:41:44 -08:00
tree-walk.h rename: Break filepairs with different types. 2007-12-02 02:24:46 -08:00
tree.c Make on-disk index representation separate from in-core one 2008-01-21 12:44:31 -08:00
tree.h
unpack-file.c Use xmkstemp() instead of mkstemp() 2007-08-14 22:20:26 -07:00
unpack-trees.c Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
unpack-trees.h Add "skip_unmerged" option to unpack_trees. 2008-02-09 23:16:51 -08:00
update-server-info.c
upload-pack.c Merge branch 'mk/maint-parse-careful' 2008-02-18 20:56:01 -08:00
usage.c print warning/error/fatal messages in one shot 2007-11-09 22:25:36 -08:00
utf8.c utf8_width(): allow non NUL-terminated input 2008-01-06 20:53:46 -08:00
utf8.h utf8_width(): allow non NUL-terminated input 2008-01-06 20:53:46 -08:00
var.c Re-fix "builtin-commit: fix --signoff" 2007-12-09 00:55:55 -08:00
walker.c Clarify error response from 'git fetch' for bad responses 2007-12-17 20:49:18 -08:00
walker.h Modularize commit-walker 2007-09-19 03:22:30 -07:00
write_or_die.c Don't fflush(stdout) when it's not helpful 2007-06-30 20:16:12 -07:00
ws.c git-apply --whitespace=fix: fix off by one thinko 2008-02-26 12:24:40 -08:00
wt-status.c Add color.ui variable which globally enables colorization if set 2008-02-18 00:00:38 -08:00
wt-status.h git-commit: squelch needless message during an empty merge 2007-12-12 20:50:33 -08:00
xdiff-interface.c Re(-re)*fix trim_common_tail() 2007-12-20 20:54:23 -08:00
xdiff-interface.h xdl_diff: identify call sites. 2007-12-13 23:04:26 -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/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.