undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
19,620 Commits 1 Branch 0 Tags 217 MiB
C 50%
Shell 38.2%
Perl 5.5%
Tcl 3.5%
Python 0.9%
Other 1.7%
fadd069d03
Go to file
Junio C Hamano fadd069d03 merge-recursive: give less scary messages when merge did not start 
When unpack_trees() three-way merge logic is called from merge-recursive
and finds that local changes are going to be clobbered, its plumbing level
messages were given as errors first, and then the merge driver added even
more scary message "fatal: merging of trees <a long object name> and
<another long object name> failed".

This is most often encountered by new CVS/SVN migrants who are used to
start a merge from a dirty work tree.  The saddest part is that the merge
refused to run to prevent _any_ damage from being done to your work tree
when these messages are given, but the messages look a lot more scarier
than the conflicted case where the user needs to resolve them.

Replace the plumbing level messages so that they talk about what it is
protecting the user from, and end the messages with "Aborting." so that it
becomes clear that the command did not do any harm.

The final "merging of trees failed" message is superfluous, unless you are
interested in debugging the merge-recursive itself.  Squelch the current
die() message by default, but allow it to help people who debug git with
verbosity level 4 or greater.

Unless there is some bug, an inner merge that does not touch working tree
should not trigger any such error, so emit the current die() message when
we see an error return from it while running the inner merge, too.  It
would also help people who debug git.

We could later add instructions on how to recover (i.e. "stash changes
away or commit on a side branch and retry") instead of the silent
exit(128) I have in this patch, and then use Peff's advice.* mechanism to
squelch it (e.g. "advice.mergeindirtytree"), but they are separate topics.

Tested-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-08 14:46:36 -07:00
block-sha1 remove ARM and Mozilla SHA1 implementations 2009-08-18 14:19:40 -07:00
compat Merge branch 'lt/block-sha1' 2009-08-27 17:00:35 -07:00
contrib Merge branch 'ld/p4' 2009-08-23 17:18:52 -07:00
Documentation GIT 1.6.5-rc0 2009-09-07 17:20:02 -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-08-16 03:46:51 -07:00
gitweb Merge branch 'mr/gitweb-snapshot' 2009-08-31 22:09:53 -07:00
perl Git.pm: Always set Repository to absolute path if autodetecting 2009-05-09 08:25:55 -07:00
ppc fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
t Merge branch 'jc/mailinfo-scissors' 2009-09-07 15:25:37 -07:00
templates Merge branch 'hv/sample-update' 2009-05-23 01:39:15 -07:00
xdiff Merge branch 'tf/diff-whitespace-incomplete-line' 2009-08-31 22:08:57 -07:00
.gitattributes .gitattributes: CR at the end of the line is an error 2009-06-21 10:42:37 -07:00
.gitignore Add git-replace to .gitignore 2009-05-31 17:03:40 -07:00
.mailmap .mailmap update 2008-07-19 11:25:51 -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
alias.c Merge branch 'jk/maint-1.6.0-trace-argv' into maint 2009-05-25 19:03:20 -07:00
alloc.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
archive-tar.c archive-tar.c: squelch a type mismatch warning 2009-05-08 23:57:29 -07:00
archive-zip.c archive: remove unused headers 2008-07-19 11:17:43 -07:00
archive.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -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 Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
builtin-annotate.c
builtin-apply.c builtin-apply.c: get rid of an unnecessary use of temporary array 2009-09-01 08:02:51 -07:00
builtin-archive.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -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 UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-bundle.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -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 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 parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-checkout.c Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -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 Merge branch 'jk/clone-b' 2009-09-07 15:24:53 -07:00
builtin-commit-tree.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-commit.c git commit --dry-run -v: show diff in color when asked 2009-08-15 02:33:21 -07: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 git-describe: Die early if there are no possible descriptions 2009-08-06 13:35:55 -07:00
builtin-diff-files.c Add cache preload facility 2008-11-14 19:11:49 -08:00
builtin-diff-index.c diff*: fix worktree setup 2008-08-28 20:50:10 -07:00
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--tool.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -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 quickfetch(): Prevent overflow of the rev-list command line 2009-07-10 23:53:17 -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 Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
builtin-gc.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-grep.c grep: Add --max-depth option. 2009-07-22 21:54:54 -07:00
builtin-help.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
builtin-http-fetch.c Merge branch 'ho/dashless' 2008-09-09 22:57:35 -07:00
builtin-init-db.c Merge branch 'ns/init-mkdir' 2009-08-05 12:39:33 -07:00
builtin-log.c git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
builtin-ls-files.c Add 'fill_directory()' helper function for directory traversal 2009-07-09 01:11:26 -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 mailinfo.scissors: new configuration 2009-08-26 22:30:33 -07:00
builtin-mailsplit.c Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings 2009-08-05 12:14:00 -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 git-merge-ours: make it a builtin. 2007-11-22 14:21:59 -08:00
builtin-merge-recursive.c MinGW: Fix compiler warning in merge-recursive 2009-05-23 01:54:45 -07:00
builtin-merge.c Merge branch 'jk/maint-merge-msg-fix' 2009-08-16 04:13:04 -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 Merge branch 'np/maint-1.6.3-deepen' 2009-09-07 15:23:50 -07: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 Merge branch 'maint' 2009-09-06 00:39:32 -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: remove unnecessary run_status report 2009-07-06 02:45:52 -07:00
builtin-reflog.c Better usage string for reflog. 2009-08-05 09:45:00 -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 bisect: add parameters to "filter_skipped" 2009-06-06 11:26:56 -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 Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-show-branch.c git-merge-base/git-show-branch --merge-base: Documentation and test 2009-08-05 10:29:37 -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' 2009-08-27 16:59:08 -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 update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
bundle.c Terminate argv with NULL before calling setup_revisions() 2009-05-21 08:56:24 -07:00
bundle.h Move bundle specific stuff into bundle.[ch] 2007-09-19 03:22:30 -07:00
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 Merge branch 'lt/approxidate' 2009-08-31 22:11:36 -07:00
check_bindir Move all dashed-form commands to libexecdir 2008-06-19 16:00:38 -07:00
check-builtins.sh
check-racy.c ce_match_stat, run_diff_files: use symbolic constants for readability 2007-11-10 00:24:51 -08:00
color.c 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 difftool: move 'git-difftool' out of contrib 2009-04-07 22:19:56 -07:00
commit.c commit.c: rename variable named 'n' which masks previous declaration 2009-08-27 16:21:23 -07:00
commit.h Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
config.c Merge branch 'maint-1.6.3' into maint 2009-08-05 12:37:24 -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 copy.c: copy_fd - correctly report write errors 2008-04-22 21:21:08 -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 Merge branch 'maint' 2008-10-10 08:39:20 -07:00
ctype.c ctype.c: fix typo in comment 2009-05-01 16:07:29 -07:00
daemon.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
date.c fix approxidate parsing of relative months and years 2009-08-30 22:04:56 -07:00
decorate.c Unify signedness in hashing calls 2009-05-20 00:02:24 -07:00
decorate.h decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
delta.h Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -07:00
diff-delta.c fix style of a few comments in diff-delta.c 2007-12-18 15:22:28 -08: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 Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -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 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 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 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 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
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' 2009-03-26 00:27:03 -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 Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
fetch-pack.h Teach fetch-pack/upload-pack about --include-tag 2008-03-04 23:28:14 -08:00
fixup-builtins make remove-dashes: apply to scripts and programs as well, not just to builtins 2008-07-11 21:13:17 -07:00
fsck.c Allow the Unix epoch to be a valid commit date 2009-07-06 09:36:16 -07:00
fsck.h 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 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
git-am.sh am/mailinfo: Disable scissors processing by default 2009-08-26 22:22:22 -07:00
git-archimport.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-bisect.sh git-bisect: call the found commit "*the* first bad commit" 2009-08-26 12:05:57 -07:00
git-compat-util.h Merge branch 'lt/block-sha1' 2009-08-27 17:00:35 -07:00
git-cvsexportcommit.perl Avoid generating a warning if $fullname{$file} is undefined 2009-07-06 09:36:43 -07:00
git-cvsimport.perl Do not scramble password read from .cvspass 2009-09-05 22:34:27 -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 Add support for the Mongoose web server. 2009-08-23 15:03:53 -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-octopus: use (merge-base A (merge B C D E...)) for stepwise merge 2008-07-30 00:20:51 -07:00
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 allow pull --rebase on branch yet to be born 2009-08-12 15:50:09 -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 Fix rebase -p --onto 2009-07-22 11:15:06 -07:00
git-rebase.sh Merge branch 'gb/apply-ignore-whitespace' 2009-08-21 18:47:48 -07:00
git-relink.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-repack.sh Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
git-request-pull.sh request-pull: optionally show a patch as well 2009-07-29 11:02:49 -07:00
git-send-email.perl Merge branch 'maint-1.6.3' into maint 2009-08-05 12:37:24 -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 Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
git-submodule.sh Merge branch 'jh/submodule-foreach' 2009-08-27 16:59:25 -07:00
git-svn.perl git-svn: Use GIT_SSH setting if SVN_SSH is not set 2009-08-18 20:51:32 -07:00
GIT-VERSION-GEN GIT 1.6.4.2 2009-08-29 14:31:01 -07:00
git-web--browse.sh git: browsing paths with spaces when using the start command 2009-06-01 00:22:01 -07:00
git.c update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
git.spec.in Merge branch 'maint-1.6.0' into maint 2009-02-05 19:38:58 -08:00
graph.c Merge branch 'as/maint-graph-interesting-fix' 2009-08-27 16:59:56 -07:00
graph.h graph.c: make many functions static 2008-09-25 08:00:28 -07:00
grep.c grep: simplify -p output 2009-07-02 21:36:42 -07:00
grep.h grep: Add --max-depth option. 2009-07-22 21:54:54 -07:00
hash-object.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
hash.c Add 'const' where appropriate to index handling functions 2008-03-09 00:43:48 -08:00
hash.h Add 'const' where appropriate to index handling functions 2008-03-09 00:43:48 -08:00
help.c Merge branch 'maint-1.6.3' into maint 2009-08-12 16:15:55 -07:00
help.h Merge branch 'ar/autospell' 2008-09-07 23:52:16 -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-08-28 19:37:57 -07:00
http.h http*: add helper methods for fetching objects (loose) 2009-06-06 11:03:11 -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 Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
index-pack.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -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 git wrapper: DWIM mistyped commands 2008-08-31 10:14:58 -07:00
list-objects.c Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
list-objects.h Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
ll-merge.c Merge branch 'js/run-command-updates' 2009-08-10 22:14:57 -07:00
ll-merge.h merge-recursive: split low-level merge functions out. 2008-02-18 00:46:13 -08:00
lockfile.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
log-tree.c git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -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 update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
match-trees.c Improved const correctness for strings 2007-10-21 01:43:27 -04:00
merge-file.c Always initialize xpparam_t to 0 2008-10-25 12:09:31 -07:00
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-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 Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
name-hash.c Make hash_name_lookup able to do case-independent lookups 2008-04-09 01:22:25 -07:00
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 Move pack_refs() and friends into libgit 2008-06-19 15:53:13 -07:00
pack-revindex.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
pack-revindex.h discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-write.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack.h improve reliability of fixup_pack_header_footer() 2008-08-29 21:51:27 -07:00
pager.c pager: do wait_for_pager on signal death 2009-01-21 22:46:53 -08:00
parse-options.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
parse-options.h Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
patch-delta.c Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -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 git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
progress.c progress bar: round to the nearest instead of truncating down 2009-04-25 08:54:18 -07:00
progress.h nicer display of thin pack completion 2007-11-08 15:43:41 -08:00
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: 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 'cc/replace' 2009-08-21 18:47:53 -07:00
refs.h refs: add a "for_each_replace_ref" function 2009-05-31 17:02:59 -07:00
RelNotes GIT 1.6.4.2 2009-08-29 14:31:01 -07:00
remote.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -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 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 'as/maint-graph-interesting-fix' 2009-08-27 16:59:56 -07:00
revision.h Merge branch 'as/maint-graph-interesting-fix' 2009-08-27 16:59:56 -07:00
run-command.c Merge branch 'js/run-command-updates' 2009-08-10 22:14:57 -07:00
run-command.h run_command: report failure to execute the program, but optionally don't 2009-07-06 02:45:50 -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 Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
sha1_file.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
sha1_name.c sha1_name.c: avoid unnecessary strbuf_release 2009-07-16 15:09:21 -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
shallow.c Merge branch 'mk/maint-parse-careful' 2008-02-18 20:56:01 -08:00
shell.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
shortlog.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
show-index.c Fix some warnings (on cygwin) to allow -Werror 2008-07-05 17:26:29 -07:00
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
symlinks.c lstat_cache: guard against full match of length of 'name' parameter 2009-07-29 20:20:12 -07:00
tag.c Merge branch 'mk/maint-parse-careful' 2008-03-02 15:11:07 -08:00
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
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 Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -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 more tr portability test script fixes 2008-03-13 00:57:52 -07:00
test-sigchain.c t0005: use SIGTERM for sigchain test 2009-01-30 01:14:26 -08:00
thread-utils.c 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: Fixed a minor typo in an error message. 2009-02-25 00:49:53 -08:00
transport.c push: teach --quiet to suppress "Everything up-to-date" 2009-09-02 19:47:50 -07:00
transport.h Merge branch 'maint' 2009-08-12 16:36:04 -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 Fix tree-walking compare_entry() in the presense of --prefix 2008-03-09 00:43:47 -08:00
tree-walk.h Make 'traverse_trees()' traverse conflicting DF entries in parallel 2008-03-09 00:43:47 -08:00
tree.c Fix off-by-one in read_tree_recursive 2009-04-20 13:44:14 -07:00
tree.h add context pointer to read_tree_recursive() 2008-07-15 07:17:59 -07:00
unimplemented.sh Makefile: allow building without perl 2009-04-08 22:14:56 -07:00
unpack-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 Merge branch 'jc/upload-pack-hook' 2009-09-07 15:24:47 -07:00
usage.c die_errno(): double % in strerror() output just in case 2009-06-27 11:14:53 -07: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 Make walker.fetch_ref() take a struct ref. 2008-04-26 17:36:17 -07:00
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 Fix severe breakage in "git-apply --whitespace=fix" 2009-07-25 01:29:20 -07:00
wt-status.c status: list unmerged files much later 2009-09-01 22:29:51 -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.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.