You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Miklos Vajna b2eabcc253 Add new test to ensure git-merge handles pull.twohead and pull.octopus 17 years ago
Documentation Merge branch 'maint' 17 years ago
arm
compat compat/fopen.c: avoid clobbering the system defined fopen macro 17 years ago
contrib Documentation: remove {show,whatchanged}.difftree config options 17 years ago
git-gui Merge git://repo.or.cz/git-gui 17 years ago
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 17 years ago
gitweb Merge branch 'lw/gitweb' 17 years ago
mozilla-sha1
perl Git.pm: fix return value of config method 17 years ago
ppc
t Add new test to ensure git-merge handles pull.twohead and pull.octopus 17 years ago
templates Fix use of "perl -i" on Windows 17 years ago
xdiff xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM 17 years ago
.gitattributes Define the project whitespace policy 17 years ago
.gitignore use build-time SHELL_PATH in test scripts 17 years ago
.mailmap Sync with 1.5.4.2 and start 1.5.5 Release Notes 17 years ago
COPYING
GIT-VERSION-GEN GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy 17 years ago
INSTALL The "curl" executable is no longer required 17 years ago
Makefile shrink git-shell by avoiding redundant dependencies 17 years ago
README
RelNotes GIT 1.5.5.5 17 years ago
abspath.c shrink git-shell by avoiding redundant dependencies 17 years ago
alias.c Move split_cmdline() to alias.c 17 years ago
alloc.c
archive-tar.c Teach new attribute 'export-ignore' to git-archive 17 years ago
archive-zip.c Teach new attribute 'export-ignore' to git-archive 17 years ago
archive.c Teach new attribute 'export-ignore' to git-archive 17 years ago
archive.h Teach new attribute 'export-ignore' to git-archive 17 years ago
attr.c Ignore .gitattributes in bare repositories 17 years ago
attr.h
base85.c
blob.c
blob.h
branch.c Allow tracking branches to set up rebase by default. 17 years ago
branch.h branch: optionally setup branch.*.merge from upstream local branches 17 years ago
builtin-add.c git add: add long equivalents of '-u' and '-f' options 17 years ago
builtin-annotate.c
builtin-apply.c Merge branch 'js/config-cb' 17 years ago
builtin-archive.c Move sha1_file_to_archive into libgit 17 years ago
builtin-blame.c Provide git_config with a callback-data parameter 17 years ago
builtin-branch.c Provide git_config with a callback-data parameter 17 years ago
builtin-bundle.c Always set *nongit_ok in setup_git_directory_gently() 17 years ago
builtin-cat-file.c git cat-file: Fix memory leak in batch mode 17 years ago
builtin-check-attr.c Full rework of quote_c_style and write_name_quoted. 18 years ago
builtin-check-ref-format.c
builtin-checkout-index.c Provide git_config with a callback-data parameter 17 years ago
builtin-checkout.c checkout: "best effort" checkout 17 years ago
builtin-clean.c Provide git_config with a callback-data parameter 17 years ago
builtin-clone.c Merge branch 'jh/clone-packed-refs' 17 years ago
builtin-commit-tree.c commit-tree: lift completely arbitrary limit of 16 parents 17 years ago
builtin-commit.c Merge branch 'mo/status-untracked' 17 years ago
builtin-config.c Provide git_config with a callback-data parameter 17 years ago
builtin-count-objects.c Make builtin-count-objects.c use parse_options. 17 years ago
builtin-describe.c describe: match pattern for lightweight tags too 17 years ago
builtin-diff-files.c Merge branch 'jc/diff-no-no-index' 17 years ago
builtin-diff-index.c Provide git_config with a callback-data parameter 17 years ago
builtin-diff-tree.c Provide git_config with a callback-data parameter 17 years ago
builtin-diff.c Merge branch 'jc/diff-no-no-index' 17 years ago
builtin-fast-export.c builtin-fast-export: Add importing and exporting of revision marks 17 years ago
builtin-fetch--tool.c Error out when user doesn't have access permission to the repository 17 years ago
builtin-fetch-pack.c Incorporate fetched packs in future object traversal 17 years ago
builtin-fetch.c builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value 17 years ago
builtin-fmt-merge-msg.c Provide git_config with a callback-data parameter 17 years ago
builtin-for-each-ref.c for-each-ref: implement missing tag values 17 years ago
builtin-fsck.c move show_pack_info() where it belongs 17 years ago
builtin-gc.c Merge branch 'js/config-cb' 17 years ago
builtin-grep.c add NO_EXTERNAL_GREP build option 17 years ago
builtin-http-fetch.c Provide git_config with a callback-data parameter 17 years ago
builtin-init-db.c git-init: accept --bare option 17 years ago
builtin-log.c Merge branch 'js/config-cb' 17 years ago
builtin-ls-files.c Provide git_config with a callback-data parameter 17 years ago
builtin-ls-remote.c Always set *nongit_ok in setup_git_directory_gently() 17 years ago
builtin-ls-tree.c Provide git_config with a callback-data parameter 17 years ago
builtin-mailinfo.c Merge branch 'js/config-cb' 17 years ago
builtin-mailsplit.c mailsplit: minor clean-up in read_line_with_nul() 17 years ago
builtin-merge-base.c Provide git_config with a callback-data parameter 17 years ago
builtin-merge-file.c Merge branch 'maint' 17 years ago
builtin-merge-ours.c git-merge-ours: make it a builtin. 17 years ago
builtin-merge-recursive.c Move commit_list_count() to commit.c 17 years ago
builtin-mv.c Merge branch 'js/config-cb' 17 years ago
builtin-name-rev.c Merge branch 'maint' 17 years ago
builtin-pack-objects.c verify-pack: check packed object CRC when using index version 2 17 years ago
builtin-pack-refs.c Move pack_refs() and friends into libgit 17 years ago
builtin-prune-packed.c Remove now unnecessary 'sync()' calls 17 years ago
builtin-prune.c Remove now unnecessary 'sync()' calls 17 years ago
builtin-push.c Add a remote.*.mirror configuration option 17 years ago
builtin-read-tree.c Provide git_config with a callback-data parameter 17 years ago
builtin-reflog.c Make git reflog expire honour core.sharedRepository. 17 years ago
builtin-remote.c Move parse-options's skip_prefix() to git-compat-util.h 17 years ago
builtin-rerere.c builtin-rerere: fix a small leak 17 years ago
builtin-reset.c git-reset: honor -q and do not show progress message 17 years ago
builtin-rev-list.c Merge branch 'js/config-cb' 17 years ago
builtin-rev-parse.c Merge branch 'js/config-cb' 17 years ago
builtin-revert.c Provide git_config with a callback-data parameter 17 years ago
builtin-rm.c Provide git_config with a callback-data parameter 17 years ago
builtin-send-pack.c add special "matching refs" refspec 17 years ago
builtin-shortlog.c Merge branch 'maint-1.5.4' into maint 17 years ago
builtin-show-branch.c Merge branch 'maint' 17 years ago
builtin-show-ref.c deref_tag: handle return value NULL 17 years ago
builtin-stripspace.c Clean up stripspace a bit, use strbuf even more. 17 years ago
builtin-symbolic-ref.c Provide git_config with a callback-data parameter 17 years ago
builtin-tag.c Provide git_config with a callback-data parameter 17 years ago
builtin-tar-tree.c
builtin-unpack-objects.c Provide git_config with a callback-data parameter 17 years ago
builtin-update-index.c Merge branch 'js/config-cb' 17 years ago
builtin-update-ref.c Make old sha1 optional with git update-ref -d 17 years ago
builtin-upload-archive.c avoid off-by-one error in run_upload_archive 17 years ago
builtin-verify-pack.c move show_pack_info() where it belongs 17 years ago
builtin-verify-tag.c Provide git_config with a callback-data parameter 17 years ago
builtin-write-tree.c Provide git_config with a callback-data parameter 17 years ago
builtin.h Print info about "git help COMMAND" on git's main usage pages 17 years ago
bundle.c start_command(), if .in/.out > 0, closes file descriptors, not the callers 17 years ago
bundle.h Move bundle specific stuff into bundle.[ch] 18 years ago
cache-tree.c Merge branch 'maint-1.5.4' into maint 17 years ago
cache-tree.h Make error messages from cherry-pick/revert more sensible 17 years ago
cache.h Move split_cmdline() to alias.c 17 years ago
check-builtins.sh
check-racy.c ce_match_stat, run_diff_files: use symbolic constants for readability 17 years ago
color.c Provide git_config with a callback-data parameter 17 years ago
color.h Provide git_config with a callback-data parameter 17 years ago
combine-diff.c Merge branch 'jc/maint-combine-diff-pre-context' into maint 17 years ago
command-list.txt Officially deprecate repo-config. 17 years ago
commit.c Move commit_list_count() to commit.c 17 years ago
commit.h Move commit_list_count() to commit.c 17 years ago
config.c Merge branch 'lt/config-fsync' 17 years ago
config.mak.in autoconf: Test FREAD_READS_DIRECTORIES 17 years ago
configure.ac Consistency: Use "libcurl" instead of "cURL library" and "curl" 17 years ago
connect.c Provide git_config with a callback-data parameter 17 years ago
convert.c Provide git_config with a callback-data parameter 17 years ago
copy.c copy.c: copy_fd - correctly report write errors 17 years ago
csum-file.c Make pack creation always fsync() the result 17 years ago
csum-file.h Make pack creation always fsync() the result 17 years ago
ctype.c
daemon.c Provide git_config with a callback-data parameter 17 years ago
date.c Fix approxidate("never") to always return 0 17 years ago
decorate.c
decorate.h
delta.h
diff-delta.c fix style of a few comments in diff-delta.c 17 years ago
diff-lib.c "git diff": do not ignore index without --no-index 17 years ago
diff-no-index.c git diff --no-index: default to page like other diff frontends 17 years ago
diff.c show_stats(): fix stats width calculation 17 years ago
diff.h Merge branch 'jc/diff-no-no-index' 17 years ago
diffcore-break.c rename: Break filepairs with different types. 17 years ago
diffcore-delta.c optimize diffcore-delta by sorting hash entries. 17 years ago
diffcore-order.c Use xmemdupz() in many places. 18 years ago
diffcore-pickaxe.c
diffcore-rename.c diff: make "too many files" rename warning optional 17 years ago
diffcore.h copy vs rename detection: avoid unnecessary O(n*m) loops 17 years ago
dir.c Merge branch 'lt/case-insensitive' 17 years ago
dir.h gitignore: lazily find dtype 17 years ago
dump-cache-tree.c
entry.c Fix possible Solaris problem in 'checkout_entry()' 17 years ago
environment.c shrink git-shell by avoiding redundant dependencies 17 years ago
exec_cmd.c Trace and quote with argv: get rid of unneeded count argument. 17 years ago
exec_cmd.h use only the $PATH for exec'ing git commands 17 years ago
fast-import.c Make pack creation always fsync() the result 17 years ago
fetch-pack.h Teach fetch-pack/upload-pack about --include-tag 17 years ago
fixup-builtins
fsck.c fsck.c: fix bogus "empty tree" check 17 years ago
fsck.h add common fsck error printing function 17 years ago
generate-cmdlist.sh Consolidate command list to one. 17 years ago
git-add--interactive.perl add--interactive: allow user to choose mode update 17 years ago
git-am.sh git-am: head -1 is obsolete and doesn't work on some new systems 17 years ago
git-archimport.perl Make git-archimport log entries more consistent 18 years ago
git-bisect.sh bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting 17 years ago
git-compat-util.h Move parse-options's skip_prefix() to git-compat-util.h 17 years ago
git-cvsexportcommit.perl Merge branch 'js/cvsexportcommit' 17 years ago
git-cvsimport.perl git-cvsimport: do not fail when CVSROOT is / 17 years ago
git-cvsserver.perl git-cvsserver: add ability to guess -kb from contents 17 years ago
git-filter-branch.sh Merge 1.5.5.3 in 17 years ago
git-instaweb.sh git-instaweb: improve auto-discovery of httpd and call conventions. 17 years ago
git-lost-found.sh Merge branch 'ph/parseopt-sh' 17 years ago
git-merge-octopus.sh
git-merge-one-file.sh git-merge-one-file: fix longstanding stupid thinko 17 years ago
git-merge-resolve.sh Fixing comment in merge strategies 18 years ago
git-merge-stupid.sh Fixing comment in merge strategies 18 years ago
git-merge.sh git-merge.sh: fix typo in usage message: sucesses --> succeeds 17 years ago
git-mergetool.sh mergetool: Make ECMerge use the settings as specified by the user in the GUI 17 years ago
git-parse-remote.sh
git-pull.sh pull --rebase: exit early when the working directory is dirty 17 years ago
git-quiltimport.sh quiltimport: fix misquoting of parsed -p<num> parameter 17 years ago
git-rebase--interactive.sh git-rebase -i: mention the short command aliases in the todo list 17 years ago
git-rebase.sh git-rebase.sh: Add check if rebase is in progress 17 years ago
git-relink.perl git-relink: avoid hard linking in objects/info directory 17 years ago
git-repack.sh Remove now unnecessary 'sync()' calls 17 years ago
git-request-pull.sh Merge branch 'ph/parseopt-sh' 17 years ago
git-send-email.perl git-send-email: allow whitespace in addressee list 17 years ago
git-sh-setup.sh Simplify setup of $GIT_DIR in git-sh-setup.sh 17 years ago
git-stash.sh Ignore dirty submodule states during rebase and stash 17 years ago
git-submodule.sh git-submodule - Fix errors regarding resolve_relative_url 17 years ago
git-svn.perl git-svn: don't sanitize remote names in config 17 years ago
git-web--browse.sh web--browse: use custom commands defined at config time 17 years ago
git.c Move split_cmdline() to alias.c 17 years ago
git.spec.in Update RPM spec to drop curl executable requirement 17 years ago
graph.c git log --graph: print '*' for all commits, including merges 17 years ago
graph.h log --graph --left-right: show left/right information in place of '*' 17 years ago
grep.c
grep.h
hash-object.c Merge branch 'js/config-cb' 17 years ago
hash.c Add 'const' where appropriate to index handling functions 17 years ago
hash.h Add 'const' where appropriate to index handling functions 17 years ago
help.c help: check early if we have a command, if not try a documentation topic 17 years ago
http-push.c move show_pack_info() where it belongs 17 years ago
http-walker.c move show_pack_info() where it belongs 17 years ago
http.c Don't allocate too much memory in quote_ref_url 17 years ago
http.h Make walker.fetch_ref() take a struct ref. 17 years ago
ident.c commit: Show committer if automatic 17 years ago
imap-send.c Provide git_config with a callback-data parameter 17 years ago
index-pack.c Make pack creation always fsync() the result 17 years ago
interpolate.c Avoid unnecessary "if-before-free" tests. 17 years ago
interpolate.h
list-objects.c list-objects.c::process_tree/blob: check for NULL 17 years ago
list-objects.h
ll-merge.c Provide git_config with a callback-data parameter 17 years ago
ll-merge.h merge-recursive: split low-level merge functions out. 17 years ago
lockfile.c rollback lock files on more signals than just SIGINT 17 years ago
log-tree.c log --graph --left-right: show left/right information in place of '*' 17 years ago
log-tree.h Remove dead code: show_log() sep argument and diff_options.msg_sep 17 years ago
mailmap.c mailmap: fix bogus for() loop that happened to be safe by accident 17 years ago
mailmap.h
match-trees.c Improved const correctness for strings 17 years ago
merge-file.c xdl_diff: identify call sites. 17 years ago
merge-index.c git-merge-index documentation: clarify synopsis 17 years ago
merge-recursive.h Build-in merge-recursive 17 years ago
merge-tree.c Make 'traverse_trees()' traverse conflicting DF entries in parallel 17 years ago
mktag.c mktag.c: tweak validation of tagger field and adjust test script 17 years ago
mktree.c Rework unquote_c_style to work on a strbuf. 18 years ago
name-hash.c Make hash_name_lookup able to do case-independent lookups 17 years ago
object.c parse_object_buffer: don't ignore errors from the object specific parsing functions 17 years ago
object.h Remove unused object-ref code 17 years ago
pack-check.c verify-pack: check packed object CRC when using index version 2 17 years ago
pack-redundant.c
pack-refs.c Move pack_refs() and friends into libgit 17 years ago
pack-refs.h Move pack_refs() and friends into libgit 17 years ago
pack-revindex.c call init_pack_revindex() lazily 17 years ago
pack-revindex.h call init_pack_revindex() lazily 17 years ago
pack-write.c Make pack creation always fsync() the result 17 years ago
pack.h verify-pack: check packed object CRC when using index version 2 17 years ago
pager.c Provide git_config with a callback-data parameter 17 years ago
parse-options.c Move parse-options's skip_prefix() to git-compat-util.h 17 years ago
parse-options.h parse-options.c: introduce OPT_DATE 17 years ago
patch-delta.c
patch-id.c
patch-ids.c Make the diff_options bitfields be an unsigned with explicit masks. 17 years ago
patch-ids.h
path-list.c path-list: add functions to work with unsorted lists 17 years ago
path-list.h path-list: add functions to work with unsorted lists 17 years ago
path.c shrink git-shell by avoiding redundant dependencies 17 years ago
pkt-line.c Cleanup xread() loops to use read_in_full() 17 years ago
pkt-line.h
pretty.c log --pretty: do not accept bogus "--prettyshort" 17 years ago
progress.c progress.c: avoid use of dynamic-sized array 17 years ago
progress.h nicer display of thin pack completion 17 years ago
quote.c shrink git-shell by avoiding redundant dependencies 17 years ago
quote.h Make private quote_path() in wt-status.c available as quote_path_relative() 17 years ago
reachable.c Merge branch 'mk/maint-parse-careful' 17 years ago
reachable.h
read-cache.c Merge branch 'lt/racy-empty' 17 years ago
receive-pack.c Provide git_config with a callback-data parameter 17 years ago
reflog-walk.c git log -g: Complain, but do not fail, when no reflogs are there 18 years ago
reflog-walk.h git log -g: Complain, but do not fail, when no reflogs are there 18 years ago
refs.c Merge branch 'db/clone-in-c' 17 years ago
refs.h Allow for having for_each_ref() list extra refs 17 years ago
remote.c clean up error conventions of remote.c:match_explicit 17 years ago
remote.h Merge branch 'db/clone-in-c' 17 years ago
revision.c log --pretty: do not accept bogus "--prettyshort" 17 years ago
revision.h log and rev-list: add --graph option 17 years ago
run-command.c run-command: Redirect stderr to a pipe before redirecting stdout to stderr 17 years ago
run-command.h start_command(), if .in/.out > 0, closes file descriptors, not the callers 17 years ago
send-pack.h Teach send-pack a mirror mode 17 years ago
server-info.c Don't access line[-1] for a zero-length "line" from fgets. 17 years ago
setup.c Make git_dir a path relative to work_tree in setup_work_tree() 17 years ago
sha1-lookup.c sha1-lookup: make selection of 'middle' less aggressive 17 years ago
sha1-lookup.h sha1-lookup: more memory efficient search in sorted list of SHA-1 17 years ago
sha1_file.c Merge branch 'lt/config-fsync' 17 years ago
sha1_name.c Merge branch 'maint-1.5.4' into maint 17 years ago
shallow.c Merge branch 'mk/maint-parse-careful' 17 years ago
shell.c shrink git-shell by avoiding redundant dependencies 17 years ago
shortlog.h Add API access to shortlog 17 years ago
show-index.c Use PRIuMAX instead of 'unsigned long long' in show-index 17 years ago
sideband.c recv_sideband: Do not use ANSI escape sequence on dumb terminals. 17 years ago
sideband.h
strbuf.c Avoid a useless prefix lookup in strbuf_expand() 17 years ago
strbuf.h Avoid a useless prefix lookup in strbuf_expand() 17 years ago
symlinks.c Optimize symlink/directory detection 17 years ago
tag.c Merge branch 'mk/maint-parse-careful' 17 years ago
tag.h
tar.h
test-absolute-path.c Add is_absolute_path() and make_absolute_path() 18 years ago
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-parse-options.c Extend parse-options test suite 17 years ago
test-sha1.c
test-sha1.sh more tr portability test script fixes 17 years ago
thread-utils.c pack-objects: Add runtime detection of online CPU's 17 years ago
thread-utils.h pack-objects: Add runtime detection of online CPU's 17 years ago
trace.c Trace and quote with argv: get rid of unneeded count argument. 17 years ago
transport.c Merge branch 'db/clone-in-c' 17 years ago
transport.h Mark the list of refs to fetch as const 17 years ago
tree-diff.c Fix small memory leaks induced by diff_tree_setup_paths 17 years ago
tree-walk.c Fix tree-walking compare_entry() in the presense of --prefix 17 years ago
tree-walk.h Make 'traverse_trees()' traverse conflicting DF entries in parallel 17 years ago
tree.c Merge branch 'mk/maint-parse-careful' 17 years ago
tree.h
unpack-file.c Provide git_config with a callback-data parameter 17 years ago
unpack-trees.c unpack_trees(): allow callers to differentiate worktree errors from merge errors 17 years ago
unpack-trees.h unpack-trees: allow Porcelain to give different error messages 17 years ago
update-server-info.c
upload-pack.c Teach fetch-pack/upload-pack about --include-tag 17 years ago
usage.c print warning/error/fatal messages in one shot 17 years ago
utf8.c utf8_width(): allow non NUL-terminated input 17 years ago
utf8.h utf8_width(): allow non NUL-terminated input 17 years ago
var.c Provide git_config with a callback-data parameter 17 years ago
walker.c Fix "git clone http://$URL" to check out the worktree when asked 17 years ago
walker.h Make walker.fetch_ref() take a struct ref. 17 years ago
wrapper.c Shrink the git binary a bit by avoiding unnecessary inline functions 17 years ago
write_or_die.c Make pack creation always fsync() the result 17 years ago
ws.c git-apply --whitespace=fix: fix off by one thinko 17 years ago
wt-status.c Add configuration option for default untracked files mode 17 years ago
wt-status.h Add argument 'no' commit/status option -u|--untracked-files 17 years ago
xdiff-interface.c Merge branch 'maint' 17 years ago
xdiff-interface.h xdl_diff: identify call sites. 17 years ago

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.