development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
18641 commits 6 branches 951 tags 697 MiB
C 50.1%
Shell 38.8%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Clemens Buchacher c8c562a238 refuse to merge during a merge 
The following is an easy mistake to make for users coming from version
control systems with an "update and commit"-style workflow.

        1. git pull
        2. resolve conflicts
        3. git pull

Step 3 overrides MERGE_HEAD, starting a new merge with dirty index.
IOW, probably not what the user intended. Instead, refuse to merge
again if a merge is in progress.

Reported-by: Dave Olszewski <cxreg@pobox.com>
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-01 19:42:17 -07:00
arm fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
compat Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
contrib completion: use git rev-parse to detect bare repos 2009-05-20 18:35:23 -07:00
Documentation Prepare for 1.6.3.2 2009-05-25 19:20:39 -07:00
git-gui Merge git://repo.or.cz/git-gui 2009-05-01 22:11:57 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2009-04-30 19:56:28 -07:00
gitweb Documentation: fix typos / spelling mistakes 2009-04-20 15:56:07 -07:00
mozilla-sha1 fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
perl add --html-path to get the location of installed HTML docs 2009-04-04 23:57:59 -07:00
ppc fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
t refuse to merge during a merge 2009-06-01 19:42:17 -07:00
templates pre-commit.sample: don't print incidental SHA1 2009-05-16 11:57:17 -07:00
xdiff Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
.gitattributes git-gui: Use gitattribute "encoding" for file content display 2008-09-24 12:48:31 -07:00
.gitignore Merge branch 'da/difftool' 2009-04-17 21:42:12 -07:00
.mailmap
abspath.c make_absolute_path(): check bounds when seeing an overlong symlink 2008-12-17 13:36:34 -08:00
alias.c Merge branch 'jk/maint-1.6.0-trace-argv' into maint 2009-05-25 19:03:20 -07:00
alloc.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
archive-tar.c archive-tar.c: squelch a type mismatch warning 2009-05-08 23:57:29 -07:00
archive-zip.c
archive.c archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
archive.h archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
attr.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
attr.h attr: add GIT_ATTR_INDEX "direction" 2009-04-17 21:05:49 -07:00
base85.c
bisect.c rev-list: add "int bisect_show_flags" in "struct rev_list_info" 2009-04-07 22:12:44 -07:00
bisect.h rev-list: add "int bisect_show_flags" in "struct rev_list_info" 2009-04-07 22:12:44 -07:00
blob.c
blob.h
branch.c strbuf_check_branch_ref(): a helper to check a refname for a branch 2009-03-22 23:52:11 -07:00
branch.h Make git-clone respect branch.autosetuprebase 2009-03-03 22:58:52 -08:00
builtin-add.c add: don't complain when adding empty project root 2009-05-09 08:27:11 -07:00
builtin-annotate.c
builtin-apply.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-archive.c recv_sideband: Bands #2 and #3 always go to stderr 2009-03-10 23:23:02 -07:00
builtin-bisect--helper.c bisect--helper: implement "git bisect--helper" 2009-04-05 01:29:44 -07:00
builtin-blame.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-branch.c shorten_unambiguous_ref(): add strict mode 2009-04-13 09:36:44 -07:00
builtin-bundle.c
builtin-cat-file.c fix cat-file usage message and documentation 2009-05-25 12:08:15 -07:00
builtin-check-attr.c Fix non-literal format in printf-style calls 2008-11-11 14:50:02 -08:00
builtin-check-ref-format.c strbuf_check_branch_ref(): a helper to check a refname for a branch 2009-03-22 23:52:11 -07:00
builtin-checkout-index.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-checkout.c Merge branch 'lt/maint-diff-reduce-lstat' into maint 2009-05-25 19:04:08 -07:00
builtin-clean.c Turn the flags in struct dir_struct into a single variable 2009-02-18 11:04:19 -08:00
builtin-clone.c print unlink(2) errno in copy_or_link_directory 2009-04-29 18:37:42 -07:00
builtin-commit-tree.c Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix 2008-09-18 20:32:50 -07:00
builtin-commit.c Merge branch 'maint-1.6.1' into maint 2009-04-05 01:04:54 -07:00
builtin-config.c git config: error when editing a repo config and not being in one 2009-04-29 16:50:21 -07:00
builtin-count-objects.c Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -07:00
builtin-describe.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-diff-files.c Add cache preload facility 2008-11-14 19:11:49 -08:00
builtin-diff-index.c
builtin-diff-tree.c Remove unused assignments 2009-03-14 13:36:34 -07:00
builtin-diff.c reorder ALLOW_TEXTCONV option setting 2008-12-07 19:59:25 -08:00
builtin-fast-export.c builtin-fast-export.c: handle nested tags 2009-04-19 12:29:26 -07:00
builtin-fetch--tool.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
builtin-fetch-pack.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
builtin-fetch.c fetch: report ref storage DF errors more accurately 2009-05-25 12:07:07 -07:00
builtin-fmt-merge-msg.c Move local variables to narrower scopes 2009-03-07 20:52:23 -08:00
builtin-for-each-ref.c for-each-ref: fix segfault in copy_email 2009-05-20 00:06:19 -07:00
builtin-fsck.c Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -07:00
builtin-gc.c gc --aggressive: make it really aggressive 2009-03-18 19:11:34 -07:00
builtin-grep.c grep: don't support "grep.color"-like config options 2009-04-20 22:55:56 -07:00
builtin-help.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-http-fetch.c Merge branch 'ho/dashless' 2008-09-09 22:57:35 -07:00
builtin-init-db.c Merge branch 'maint' 2009-04-18 14:45:59 -07:00
builtin-log.c format-patch let -k override a config-specified format.numbered 2009-05-09 08:10:15 -07:00
builtin-ls-files.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
builtin-ls-remote.c git ls-remote: make usage string match manpage 2008-11-11 13:24:00 -08:00
builtin-ls-tree.c Produce a nicer output in case of sha1_object_info failures in ls-tree -l 2009-03-20 09:35:21 -07:00
builtin-mailinfo.c Remove unused assignments 2009-03-14 13:36:34 -07:00
builtin-mailsplit.c
builtin-merge-base.c parse-opt: migrate git-merge-base. 2008-10-02 18:46:02 -07:00
builtin-merge-file.c merge-file: handle freopen() failure 2008-12-26 19:10:02 -08:00
builtin-merge-ours.c
builtin-merge-recursive.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-merge.c refuse to merge during a merge 2009-06-01 19:42:17 -07:00
builtin-mv.c builtin-mv.c: check for unversionned files before looking at the destination. 2009-02-04 11:07:42 -08:00
builtin-name-rev.c
builtin-pack-objects.c Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
builtin-pack-refs.c
builtin-prune-packed.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-prune.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-push.c Merge branch 'fg/push-default' 2009-03-26 00:26:25 -07:00
builtin-read-tree.c Merge branch 'jc/maint-read-tree-multi' 2009-04-22 19:36:19 -07:00
builtin-receive-pack.c Merge branch 'np/push-delta' into maint 2009-05-25 19:02:11 -07:00
builtin-reflog.c Fix more typos/spelling in comments 2009-04-22 19:03:39 -07:00
builtin-remote.c fix segfault showing an empty remote 2009-05-27 23:16:16 -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 Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
builtin-rev-list.c Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
builtin-rev-parse.c rev-parse: --abbrev-ref option to shorten ref name 2009-04-13 09:42:55 -07:00
builtin-revert.c Merge branch 'maint-1.6.1' into maint 2009-03-07 21:00:27 -08:00
builtin-rm.c builtin-rm: use warning() instead of fprintf(stderr, "warning: ") 2009-03-23 21:02:27 -07:00
builtin-send-pack.c allow OFS_DELTA objects during a push 2009-05-01 22:06:41 -07:00
builtin-shortlog.c Remove unused assignments 2009-03-14 13:36:34 -07:00
builtin-show-branch.c show-branch: Fix die message in parse_reflog_param() 2009-05-17 12:05:22 -07:00
builtin-show-ref.c builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ") 2009-03-23 21:02:27 -07:00
builtin-stripspace.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-symbolic-ref.c symbolic-ref: allow refs/<whatever> in HEAD 2009-02-13 18:20:44 -08:00
builtin-tag.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-tar-tree.c archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
builtin-unpack-objects.c Merge branch 'lt/maint-wrap-zlib' into maint 2009-02-05 18:01:00 -08:00
builtin-update-index.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-update-ref.c Fix git update-ref --no-deref -d. 2008-10-26 14:44:25 -07:00
builtin-upload-archive.c improve missing repository error message 2009-03-04 20:37:21 -08:00
builtin-verify-pack.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
builtin-verify-tag.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-write-tree.c git add --intent-to-add: do not let an empty blob be committed by accident 2008-11-30 17:59:19 -08:00
builtin.h bisect--helper: implement "git bisect--helper" 2009-04-05 01:29:44 -07:00
bundle.c Merge branch 'js/maint-all-implies-HEAD' 2009-01-25 17:13:02 -08:00
bundle.h
cache-tree.c Move prime_cache_tree() to cache-tree.c 2009-04-20 04:16:41 -07:00
cache-tree.h Move prime_cache_tree() to cache-tree.c 2009-04-20 04:16:41 -07:00
cache.h Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -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 Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
command-list.txt difftool: move 'git-difftool' out of contrib 2009-04-07 22:19:56 -07:00
commit.c Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
commit.h Make has_commit() non-static 2009-01-28 11:33:03 -08:00
config.c improve error message in config.c 2009-05-05 22:49:43 -07:00
config.mak.in config.mak.in: define paths without trailing slash 2009-02-05 00:29:23 -08:00
configure.ac configure: rework pthread handling to allow for user defined flags 2009-03-12 23:23:39 -07:00
connect.c connect: replace inet_ntop with getnameinfo 2009-04-25 09:29:38 -07:00
convert.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
copy.c
COPYING
csum-file.c Merge branch 'maint' 2008-10-10 08:39:20 -07:00
csum-file.h Merge branch 'maint' 2008-10-10 08:39:20 -07:00
ctype.c ctype.c: fix typo in comment 2009-05-01 16:07:29 -07:00
daemon.c daemon.c: fix segfault on OS X 2009-04-29 16:50:21 -07:00
date.c Work around BSD whose typeof(tv.tv_sec) != time_t 2009-05-05 22:19:14 -07:00
decorate.c Fix type-punning issues 2009-05-16 22:41:18 -07:00
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'lt/maint-diff-reduce-lstat' into maint 2009-05-25 19:04:08 -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 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
diff.h Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking 2009-03-04 00:56:51 -08:00
diffcore-break.c Remove unused function scope local variables 2009-03-07 20:52:17 -08:00
diffcore-delta.c
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 Merge branch 'maint' 2008-11-02 16:36:40 -08:00
dir.c dir.c: clean up handling of 'path' parameter in read_directory_recursive() 2009-05-16 22:41:46 -07:00
dir.h Turn the flags in struct dir_struct into a single variable 2009-02-18 11:04:19 -08:00
editor.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
entry.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
environment.c Rename core.unreliableHardlinks to core.createObject 2009-04-29 16:50:07 -07:00
exec_cmd.c Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1 2009-04-08 23:01:10 -07:00
exec_cmd.h Refactor git_set_argv0_path() to git_extract_argv0_path() 2009-01-26 00:26:05 -08:00
fast-import.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
fetch-pack.h
fixup-builtins
fsck.c Remove unused function scope local variables 2009-03-07 20:52:17 -08:00
fsck.h Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
generate-cmdlist.sh generate-cmdlist.sh: avoid selecting synopsis at wrong place 2008-11-30 18:16:32 -08:00
git-add--interactive.perl Merge branch 'mm/maint-add-p-quit' 2009-04-20 03:39:38 -07:00
git-am.sh Work around ash "alternate value" expansion bug 2009-04-18 21:37:46 -07:00
git-archimport.perl
git-bisect.sh Merge branch 'cc/bisect-filter' 2009-04-12 16:46:40 -07:00
git-compat-util.h Introduce an unlink(2) wrapper which gives warning if unlink failed 2009-04-29 18:37:41 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl git-cvsserver: run post-update hook *after* update. 2009-01-30 21:11:46 -08:00
git-difftool--helper.sh mergetool--lib: simplify API usage by removing more global variables 2009-04-12 15:19:12 -07:00
git-difftool.perl Explain seemingly pointless use of system in difftool 2009-04-24 01:20:35 -07:00
git-filter-branch.sh Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-instaweb.sh git-instaweb: fix lighttpd configuration on cygwin 2009-03-10 23:16:52 -07:00
git-lost-found.sh lost-found: use git rev-parse -q 2008-12-03 14:27:17 -08:00
git-merge-octopus.sh
git-merge-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: simplify API usage by removing more global variables 2009-04-12 15:19:12 -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 Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-pull.sh Convert to use quiet option when available 2009-04-22 19:05:37 -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 -i: avoid 'git reset' when possible 2009-03-03 10:56:22 -08:00
git-rebase.sh rebase: fix typo (force_rebas -> force-rebas) 2009-03-27 14:26:34 -07:00
git-relink.perl
git-repack.sh Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 2009-05-03 15:01:31 -07:00
git-request-pull.sh request-pull: make usage string match manpage 2008-11-17 02:27:18 -08:00
git-send-email.perl Add parsing of elm aliases to git-send-email 2009-04-22 19:10:41 -07:00
git-sh-setup.sh git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree 2009-02-07 00:45:29 -08:00
git-stash.sh Revert "git-stash: use git rev-parse -q" 2008-12-07 17:30:35 -08:00
git-submodule.sh Work around ash "alternate value" expansion bug 2009-04-18 21:37:46 -07:00
git-svn.perl Merge branch 'maint' 2009-05-05 22:52:17 -07:00
GIT-VERSION-GEN GIT 1.6.3.1 2009-05-12 22:30:29 -07:00
git-web--browse.sh git-web--browse: Fix check for /bin/start 2009-02-09 00:06:36 -08:00
git.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
git.spec.in Merge branch 'maint-1.6.0' into maint 2009-02-05 19:38:58 -08:00
graph.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
graph.h graph.c: make many functions static 2008-09-25 08:00:28 -07:00
grep.c grep: fix word-regexp colouring 2009-05-20 18:49:20 -07:00
grep.h grep: add support for coloring with external greps 2009-03-07 11:34:59 -08:00
hash-object.c Merge branch 'en/maint-hash-object' into maint 2009-03-11 13:51:59 -07:00
hash.c
hash.h
help.c git wrapper: also use aliases to correct mistyped commands 2008-09-11 23:05:39 -07:00
help.h Merge branch 'ar/autospell' 2008-09-07 23:52:16 -07:00
http-push.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
http-walker.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
http.c Allow curl to rewind the read buffers 2009-04-02 13:04:07 -07:00
http.h Allow curl to rewind the read buffers 2009-04-02 13:04:07 -07:00
ident.c Add backslash to list of 'crud' characters in real name 2008-12-02 15:29:13 -08:00
imap-send.c Remove unused assignments 2009-03-14 13:36:34 -07:00
index-pack.c Merge branch 'jc/shared-literally' 2009-04-06 00:42:52 -07:00
INSTALL Add support for a pdf version of the user manual 2008-12-10 19:17:43 -08: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 replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
ll-merge.h
lockfile.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
log-tree.c log-tree: fix patch filename computation in "git format-patch" 2009-03-27 01:10:27 -07:00
log-tree.h format-patch: --attach/inline uses filename instead of SHA1 2009-03-22 21:45:19 -07:00
mailmap.c Merge branch 'maint' 2009-04-01 22:46:31 -07:00
mailmap.h Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -08:00
Makefile Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maint 2009-05-25 19:04:29 -07:00
match-trees.c
merge-file.c Always initialize xpparam_t to 0 2008-10-25 12:09:31 -07:00
merge-index.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
merge-recursive.c Merge branch 'do/maint-merge-recursive-fix' into maint 2009-05-25 19:03:43 -07:00
merge-recursive.h merge-recursive: move current_{file,directory}_set to struct merge_options 2008-09-04 22:50:43 -07:00
merge-tree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktag.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
name-hash.c
object.c Fix type-punning issues 2009-05-16 22:41:18 -07:00
object.h Merge branch 'js/maint-all-implies-HEAD' into maint 2009-02-05 17:54:12 -08:00
pack-check.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
pack-redundant.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
pack-refs.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
pack-refs.h
pack-revindex.c make find_pack_revindex() aware of the nasty world 2008-11-02 15:22:35 -08:00
pack-revindex.h
pack-write.c Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1 2009-03-21 22:53:36 -07:00
pack.h
pager.c pager: do wait_for_pager on signal death 2009-01-21 22:46:53 -08:00
parse-options.c parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together 2009-03-09 15:32:50 -07:00
parse-options.h Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
patch-delta.c
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 set_shared_perm(): sometimes we know what the final mode bits should look like 2009-03-28 08:02:15 -07:00
pkt-line.c
pkt-line.h
preload-index.c Makefile: introduce NO_PTHREADS 2008-12-02 15:29:12 -08:00
pretty.c format_sanitized_subject: Don't trim past initial length of strbuf 2009-04-01 11:05:31 -07:00
progress.c progress bar: round to the nearest instead of truncating down 2009-04-25 08:54:18 -07:00
progress.h
quote.c quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array 2009-03-30 01:22:53 -07:00
quote.h quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array 2009-03-30 01:22:53 -07:00
reachable.c process_{tree,blob}: Remove useless xstrdup calls 2009-04-08 22:58:43 -07:00
reachable.h
read-cache.c checkout bugfix: use stat.mtime instead of stat.ctime in two places 2009-03-15 12:56:40 -07:00
README README: fix path to "gitcvs-migration.txt" and be more consistent 2009-02-25 00:49:54 -08:00
reflog-walk.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
reflog-walk.h make oneline reflog dates more consistent with multiline format 2009-03-20 00:57:27 -07:00
refs.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
refs.h shorten_unambiguous_ref(): add strict mode 2009-04-13 09:36:44 -07:00
RelNotes Prepare for 1.6.3.2 2009-05-25 19:20:39 -07:00
remote.c remote.c: do not trigger remote.<name>.<var> codepath for two-level names 2009-04-24 01:29:28 -07:00
remote.h remote: New function remote_is_configured() 2009-04-07 21:51:59 -07:00
rerere.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
rerere.h rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
revision.c Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
revision.h Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
run-command.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
run-command.h fix portability problem with IS_RUN_COMMAND_ERR 2009-04-01 11:05:54 -07:00
send-pack.h allow OFS_DELTA objects during a push 2009-05-01 22:06:41 -07:00
server-info.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
setup.c "core.sharedrepository = 0mode" should set, not loosen 2009-03-27 21:51:04 -07:00
sha1-lookup.c sha1-lookup: fix up the assertion message 2009-04-06 00:56:27 -07:00
sha1-lookup.h sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1 2009-04-04 22:57:39 -07:00
sha1_file.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
sha1_name.c Rename interpret/substitute nth_last_branch functions 2009-03-22 23:36:47 -07:00
shallow.c
shell.c git-shell: Add 'git-upload-archive' to allowed commands. 2009-04-11 11:01:15 -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_check_branch_ref(): a helper to check a refname for a branch 2009-03-22 23:52:11 -07:00
strbuf.h Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
string-list.c string-list: new for_each_string_list() function 2009-02-27 15:19:08 -08:00
string-list.h string-list: new for_each_string_list() function 2009-02-27 15:19:08 -08:00
symlinks.c Revert "lstat_cache(): print a warning if doing ping-pong between cache types" 2009-03-17 12:10:58 -07:00
tag.c
tag.h
tar.h
test-chmtime.c Add --verbose|-v to test-chmtime 2008-10-31 00:19:52 -07:00
test-ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
test-date.c
test-delta.c
test-dump-cache-tree.c add test-dump-cache-tree in Makefile 2009-02-03 22:11:44 -08:00
test-genrandom.c test-genrandom: Add newline to usage string 2009-04-23 01:29:00 -07:00
test-match-trees.c
test-parse-options.c
test-path-utils.c Introduce the function strip_path_suffix() 2009-02-19 22:45:48 -08:00
test-sha1.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
test-sha1.sh
test-sigchain.c t0005: use SIGTERM for sigchain test 2009-01-30 01:14:26 -08:00
thread-utils.c
thread-utils.h
trace.c trace: Fixed a minor typo in an error message. 2009-02-25 00:49:53 -08:00
transport.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
transport.h Move push matching and reporting logic into transport.c 2009-03-09 15:41:20 -07:00
tree-diff.c Fix typos / spelling in comments 2009-04-22 19:02:12 -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 Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
unpack-trees.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
unpack-trees.h checkout: do not lose staged removal 2008-09-09 22:55:22 -07:00
update-server-info.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
upload-pack.c Merge branch 'lt/pack-object-memuse' into maint 2009-05-03 15:02:40 -07:00
usage.c Increase the size of the die/warning buffer to avoid truncation 2009-03-24 16:58:20 -07:00
userdiff.c Change the spelling of "wordregex". 2009-01-21 23:52:16 -08:00
userdiff.h color-words: make regex configurable via attributes 2009-01-17 10:44:21 -08:00
utf8.c utf8: add utf8_strwidth() 2009-02-04 16:30:43 -08:00
utf8.h utf8: add utf8_strwidth() 2009-02-04 16:30:43 -08:00
var.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
walker.c Drop double-semicolon in C 2009-02-10 22:26:37 -08:00
walker.h
wrapper.c Introduce an unlink(2) wrapper which gives warning if unlink failed 2009-04-29 18:37:41 -07:00
write_or_die.c
ws.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
wt-status.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
wt-status.h
xdiff-interface.c Remove unused function scope local variables 2009-03-07 20:52:17 -08:00
xdiff-interface.h add xdi_diff_hunks() for callers that only need hunk lengths 2008-10-25 12:09:31 -07:00

README 

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git.or.cz/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe
to the list, send an email with just "subscribe git" in the body to
majordomo@vger.kernel.org. The mailing list archives are available at
http://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.