mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-02 15:28:21 +01:00
Code Activity
Mirror of https://github.com/git/git
19979 commits 6 branches 956 tags 488 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Jonathan Nieder 20c7e3d5cf Show usage string for 'git merge-ours -h' 
This change is strictly about 'git merge-ours -h' without
any other options and arguments.

This change cannot break compatibility since merge drivers are
always passed '--', among other arguments.

Any usage string for this command is a lie, since it ignored its
arguments until now.  Still, it makes sense to let the user know
the expected usage when asked.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-09 17:08:45 -08:00
block-sha1 remove ARM and Mozilla SHA1 implementations 2009-08-18 14:19:40 -07:00
compat Use faster byte swapping when compiling with MSVC 2009-10-30 09:37:48 -07:00
contrib Retire fetch--tool helper to contrib/examples 2009-11-09 17:08:44 -08:00
Documentation Merge branch 'maint' 2009-11-04 16:34:02 -08:00
git-gui Merge git://repo.or.cz/git-gui 2009-10-27 14:55:37 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2009-09-20 23:47:52 -07:00
gitweb Merge branch 'sb/gitweb-link-author' 2009-10-25 18:40:21 -07:00
perl perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR 2009-09-25 14:00:04 -07:00
ppc
t Merge branch 'jc/commit-s-subject-is-not-a-footer' 2009-11-06 23:17:47 -08:00
templates Revert "Don't create the $GIT_DIR/branches directory on init" 2009-10-31 11:16:50 -07:00
xdiff Merge branch 'tf/diff-whitespace-incomplete-line' into maint 2009-09-16 14:27:08 -07:00
.gitattributes .gitattributes: CR at the end of the line is an error 2009-06-21 10:42:37 -07:00
.gitignore Add intermediate build products to .gitignore 2009-11-08 17:04:50 -08:00
.mailmap Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
abspath.c abspath.c: move declaration of 'len' into inner block and use appropriate type 2009-08-27 16:20:53 -07:00
advice.c status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
advice.h status: make "how to stage" messages optional 2009-09-11 21:33:24 -07: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.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -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 git-bisect: call the found commit "*the* first bad commit" 2009-08-26 12:05:57 -07:00
bisect.h bisect: add parameters to "filter_skipped" 2009-06-06 11:26:56 -07:00
blob.c
blob.h
branch.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
branch.h Make git-clone respect branch.autosetuprebase 2009-03-03 22:58:52 -08:00
builtin-add.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'jc/maint-blank-at-eof' 2009-10-17 00:11:03 -07:00
builtin-archive.c git-archive: infer output format from filename when unspecified 2009-09-13 13:54:39 -07:00
builtin-bisect--helper.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-blame.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-branch.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-bundle.c Update the usage bundle string. 2009-09-18 19:47:15 -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 check-ref-format: simplify --print implementation 2009-10-12 22:19:35 -07:00
builtin-checkout-index.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-checkout.c fixup tr/stash-format merge 2009-10-30 20:18:31 -07:00
builtin-clean.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-clone.c clone: detect extra arguments 2009-10-30 15:18:11 -07:00
builtin-commit-tree.c Show usage string for 'git commit-tree -h' 2009-11-09 17:08:44 -08:00
builtin-commit.c Merge branch 'jc/commit-s-subject-is-not-a-footer' 2009-11-06 23:17:47 -08:00
builtin-config.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-count-objects.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-describe.c Merge branch 'maint' 2009-10-23 22:40:18 -07:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c Remove unused assignments 2009-03-14 13:36:34 -07:00
builtin-diff.c Show usage string for 'git log -h', 'git show -h' and 'git diff -h' 2009-08-07 14:40:29 -07:00
builtin-fast-export.c git fast-export: add --no-data option 2009-07-31 07:48:09 -07: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 fetch: Speed up fetch by rewriting find_non_local_tags 2009-09-18 16:32:33 -07:00
builtin-fmt-merge-msg.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-for-each-ref.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-fsck.c fsck: default to "git fsck --full" 2009-10-20 12:11:39 -07:00
builtin-gc.c gc --auto --quiet: make the notice a bit less verboase 2009-10-21 15:28:42 -07:00
builtin-grep.c Show usage string for 'git grep -h' 2009-11-09 17:08:44 -08:00
builtin-help.c help -a: do not unnecessarily look for a repository 2009-10-28 10:42:17 -07:00
builtin-init-db.c Merge branch 'ns/init-mkdir' 2009-08-05 12:39:33 -07:00
builtin-log.c Show usage string for 'git cherry -h' 2009-11-09 17:08:44 -08:00
builtin-ls-files.c Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4 2009-10-25 15:34:27 -07:00
builtin-ls-remote.c Require a struct remote in transport_get() 2009-11-03 21:39:28 -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: check error status from rewind and ftruncate 2009-09-29 09:40:55 -07:00
builtin-mailsplit.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
builtin-merge-base.c git-merge-base/git-show-branch: Cleanup documentation and usage 2009-08-05 10:28:05 -07:00
builtin-merge-file.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-merge-ours.c Show usage string for 'git merge-ours -h' 2009-11-09 17:08:45 -08:00
builtin-merge-recursive.c MinGW: Fix compiler warning in merge-recursive 2009-05-23 01:54:45 -07:00
builtin-merge.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-mktree.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-mv.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-name-rev.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-pack-objects.c pack-objects: move thread autodetection closer to relevant code 2009-11-05 23:11:42 -08:00
builtin-pack-refs.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-prune-packed.c prune-packed: migrate to parse-options 2009-07-10 23:57:21 -07:00
builtin-prune.c environment: add global variable to disable replacement 2009-05-31 17:02:59 -07:00
builtin-push.c push: fix typo in usage 2009-10-30 15:12:00 -07:00
builtin-read-tree.c read-tree: Fix regression with creation of a new index file. 2009-08-17 09:20:52 -07:00
builtin-receive-pack.c receive-pack: run "gc --auto --quiet" and optionally "update-server-info" 2009-10-21 15:32:32 -07:00
builtin-reflog.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
builtin-remote.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-replace.c builtin-replace: use "usage_msg_opt" to give better error messages 2009-05-31 17:03:40 -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 Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
builtin-rev-list.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-rev-parse.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-revert.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-rm.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-send-pack.c transport: pass "quiet" flag to pack-objects 2009-08-05 20:14:09 -07:00
builtin-shortlog.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-show-branch.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-show-ref.c show-ref: migrate to parse-options 2009-06-20 23:50:42 -07:00
builtin-stripspace.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-symbolic-ref.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-tag.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-tar-tree.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-unpack-objects.c Merge branch 'jc/maint-unpack-objects-strict' into maint 2009-09-16 14:45:18 -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-update-server-info.c update-server-info: make builtin, use parseopt 2009-08-29 14: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 Merge branch 'maint' 2009-08-07 22:35:17 -07:00
builtin-verify-tag.c verify-tag: migrate to parse-options 2009-07-10 23:57:15 -07:00
builtin-write-tree.c write-tree: migrate to parse-options 2009-07-10 23:56:40 -07:00
builtin.h Retire fetch--tool helper to contrib/examples 2009-11-09 17:08:44 -08:00
bundle.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07: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 check_filename(): make verify_filename() callable without dying 2009-10-18 00:38:03 -07:00
check-builtins.sh
check-racy.c
check_bindir
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 Merge branch 'maint' 2009-07-22 21:56:46 -07:00
command-list.txt Documentation: add 'git replace' to main git manpage 2009-10-11 21:52:22 -07:00
commit.c Merge branch 'jc/maint-1.6.3-graft-trailing-space' 2009-10-30 20:07:08 -07:00
commit.h fixup tr/stash-format merge 2009-10-30 20:18:31 -07:00
config.c Merge branch 'jk/unwanted-advices' 2009-09-13 01:33:18 -07:00
config.mak.in configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests 2009-07-22 21:56:51 -07:00
configure.ac remove ARM and Mozilla SHA1 implementations 2009-08-18 14:19:40 -07:00
connect.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
convert.c run_command: return exit code as positive value 2009-07-05 12:16:27 -07:00
copy.c preserve mtime of local clone 2009-09-13 01:32:26 -07:00
COPYING
csum-file.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
csum-file.h
ctype.c ctype.c: fix typo in comment 2009-05-01 16:07:29 -07:00
daemon.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
date.c Fix '--relative-date' 2009-10-03 06:04:38 -04:00
decorate.c Unify signedness in hashing calls 2009-05-20 00:02:24 -07:00
decorate.h
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 'jc/shortstatus' 2009-08-28 19:38:19 -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 'js/diff-verbose-submodule' 2009-10-30 20:16:26 -07:00
diff.h Add the --submodule option to the diff option family 2009-10-19 22:31:00 -07:00
diffcore-break.c Remove unused function scope local variables 2009-03-07 20:52:17 -08:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c pickaxe: count regex matches only once 2009-03-21 23:18:53 -07:00
diffcore-rename.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
diffcore.h
dir.c clean: require double -f options to nuke nested git repository and work tree 2009-07-29 12:22:30 -07:00
dir.h clean: require double -f options to nuke nested git repository and work tree 2009-07-29 12:22:30 -07:00
editor.c
entry.c check_path(): allow symlinked directories to checkout-index --prefix 2009-08-18 03:32:45 -07:00
environment.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -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 fast-import.c::validate_raw_date(): really validate the value 2009-10-07 13:05:03 -07:00
fetch-pack.h
fixup-builtins
fsck.c Allow the Unix epoch to be a valid commit date 2009-07-06 09:36:16 -07:00
fsck.h Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'pv/maint-add-p-no-exclude' into maint 2009-10-23 22:29:19 -07:00
git-am.sh git-am: force egrep to use correct characters set 2009-09-25 15:35:05 -07:00
git-archimport.perl
git-bisect.sh bisect reset: Allow resetting to any commit, not just a branch 2009-10-13 23:19:02 -07:00
git-compat-util.h add NORETURN_PTR for function pointers 2009-10-01 04:12:21 -04: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: fix relative argument filenames 2009-10-19 00:31:02 -07:00
git-cvsserver.perl git-cvsserver: no longer use deprecated 'git-subcommand' commands 2009-09-02 18:41:42 -07: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 filter-branch: make the usage string fit on 80 chars terminals. 2009-08-18 13:35:55 -07:00
git-instaweb.sh instaweb: support mod_cgid for apache2 2009-09-29 10:06:52 -07:00
git-lost-found.sh
git-merge-octopus.sh
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 pull: improve advice for unconfigured error case 2009-10-09 11:22:43 -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 'maint' 2009-10-28 11:21:46 -07:00
git-rebase.sh rebase: use plumbing to show dirty state 2009-09-11 21:41:15 -07:00
git-relink.perl
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: optionally show a patch as well 2009-07-29 11:02:49 -07:00
git-send-email.perl Merge branch 'jp/maint-send-email-fold' into maint 2009-10-23 22:30:42 -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 list: drop the default limit of 10 stashes 2009-10-19 22:28:26 -07:00
git-submodule.sh typo fix: Directory `...' exist, ...: s/exist/exists/ 2009-09-29 08:30:13 -07:00
git-svn.perl git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents 2009-10-26 23:54:24 -07:00
GIT-VERSION-GEN GIT 1.6.5.2 2009-10-25 18:37:56 -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 Retire fetch--tool helper to contrib/examples 2009-11-09 17:08:44 -08:00
git.spec.in Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
graph.c Merge branch 'as/maint-graph-interesting-fix' 2009-08-27 16:59:56 -07:00
graph.h
grep.c grep: simplify -p output 2009-07-02 21:36:42 -07:00
grep.h Merge branch 'maint' 2009-09-13 01:30:53 -07:00
hash-object.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
hash.c
hash.h
help.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
help.h
http-fetch.c git-http-fetch: not a builtin 2009-08-05 18:37:12 -07:00
http-push.c http-push: fix xml_entities() string parsing overrun 2009-07-06 09:36:08 -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-09-14 14:48:27 -07:00
http.h http*: add helper methods for fetching objects (loose) 2009-06-06 11:03:11 -07:00
ident.c
imap-send.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
index-pack.c increase portability of NORETURN declarations 2009-10-01 04:12:21 -04:00
INSTALL INSTALL: Describe dependency knobs from Makefile 2009-09-10 21:34:43 -07:00
levenshtein.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
levenshtein.h
list-objects.c Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
list-objects.h Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
ll-merge.c Merge branch 'js/run-command-updates' 2009-08-10 22:14:57 -07:00
ll-merge.h
lockfile.c git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
log-tree.c Introduce new pretty formats %g[sdD] for reflog information 2009-10-19 22:28:26 -07:00
log-tree.h git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -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
Makefile Retire fetch--tool helper to contrib/examples 2009-11-09 17:08:44 -08:00
match-trees.c
merge-file.c
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 merge-recursive: give less scary messages when merge did not start 2009-09-08 14:46:36 -07:00
merge-recursive.h
merge-tree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktag.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
name-hash.c
object.c object: call "check_sha1_signature" with the replacement sha1 2009-05-31 17:02:59 -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 Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
pack-refs.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack-refs.h
pack-revindex.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
pack-revindex.h
pack-write.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack.h
pager.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
parse-options.h Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
patch-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -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
path.c diff: generate pretty filenames in prep_temp_blob() 2009-05-31 17:57:59 -07:00
pkt-line.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pkt-line.h
preload-index.c janitor: add DIV_ROUND_UP and use it. 2009-07-22 21:57:41 -07:00
pretty.c fixup tr/stash-format merge 2009-10-30 20:18:31 -07:00
progress.c change throughput display units with fast links 2009-10-14 01:19:29 -07:00
progress.h
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 reset: make the reminder output consistent with "checkout" 2009-08-21 21:19:35 -07: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 git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
refs.h refs: add a "for_each_replace_ref" function 2009-05-31 17:02:59 -07:00
RelNotes GIT 1.6.5.2 2009-10-25 18:37:56 -07:00
remote-curl.c Allow curl helper to work without a local repository 2009-11-03 21:41:01 -08:00
remote.c Add url.<base>.pushInsteadOf: URL rewriting for push only 2009-09-08 01:18:46 -07:00
remote.h Merge branch 'mg/pushurl' 2009-06-20 21:47:27 -07:00
replace_object.c environment: add global variable to disable replacement 2009-05-31 17:02:59 -07:00
rerere.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
rerere.h rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
revision.c improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
revision.h improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
run-command.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
run-command.h Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
send-pack.h transport: pass "quiet" flag to pack-objects 2009-08-05 20:14:09 -07:00
server-info.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
setup.c check_filename(): make verify_filename() callable without dying 2009-10-18 00:38:03 -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 incorrect error check while reading deflated pack data 2009-10-21 23:19:47 -07:00
sha1_name.c sha1_name.c: avoid unnecessary strbuf_release 2009-07-16 15:09:21 -07:00
shallow.c
shell.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
shortlog.h
show-index.c
sideband.c recv_sideband: Bands #2 and #3 always go to stderr 2009-03-10 23:23:02 -07:00
sideband.h recv_sideband: Bands #2 and #3 always go to stderr 2009-03-10 23:23:02 -07:00
sigchain.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
sigchain.h refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
strbuf.c strbuf: add new function strbuf_getwholeline() 2009-08-05 12:13:56 -07:00
strbuf.h strbuf: add new function strbuf_getwholeline() 2009-08-05 12:13:56 -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
submodule.c fixup tr/stash-format merge 2009-10-30 20:18:31 -07:00
submodule.h Add the --submodule option to the diff option family 2009-10-19 22:31:00 -07:00
symlinks.c lstat_cache: guard against full match of length of 'name' parameter 2009-07-29 20:20:12 -07:00
tag.c
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 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-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-sha1.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
test-sha1.sh
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
trace.c trace: Fixed a minor typo in an error message. 2009-02-25 00:49:53 -08:00
transport-helper.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
transport.c Require a struct remote in transport_get() 2009-11-03 21:39:28 -08:00
transport.h Merge branch 'db/vcs-helper' 2009-09-13 01:31:55 -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
tree-walk.h
tree.c Fix off-by-one in read_tree_recursive 2009-04-20 13:44:14 -07:00
tree.h
unimplemented.sh Makefile: allow building without perl 2009-04-08 22:14:56 -07:00
unpack-file.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
unpack-trees.c Merge branch 'maint' 2009-07-18 16:57:47 -07:00
unpack-trees.h read-tree: migrate to parse-options 2009-06-27 14:11:28 -07:00
upload-pack.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
usage.c add NORETURN_PTR for function pointers 2009-10-01 04:12:21 -04: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 Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
walker.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
walker.h
wrapper.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
write_or_die.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
ws.c Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof 2009-09-15 03:28:08 -07:00
wt-status.c status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
wt-status.h wt-status: collect untracked files in a separate "collect" phase 2009-08-10 12:56:43 -07:00
xdiff-interface.c userdiff: add xdiff_clear_find_func() 2009-07-01 19:16:37 -07:00
xdiff-interface.h userdiff: add xdiff_clear_find_func() 2009-07-01 19:16:37 -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-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.