Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
Junio C Hamano 5b6211aee1 Merge branch 'jk/notes-merge-config'
"git notes merge" can be told with "--strategy=<how>" option how to
automatically handle conflicts; this can now be configured by
setting notes.mergeStrategy configuration variable.

* jk/notes-merge-config:
  notes: teach git-notes about notes.<name>.mergeStrategy option
  notes: add notes.mergeStrategy option to select default strategy
  notes: add tests for --commit/--abort/--strategy exclusivity
  notes: extract parse_notes_merge_strategy to notes-utils
  notes: extract enum notes_merge_strategy to notes-utils.h
  notes: document cat_sort_uniq rewriteMode
2015-08-31 15:39:05 -07:00
block-sha1
builtin Merge branch 'jk/notes-merge-config' 2015-08-31 15:39:05 -07:00
compat Mingw: verify both ends of the pipe () call 2015-08-28 11:11:50 -07:00
contrib Merge branch 'sg/config-name-only' 2015-08-31 15:38:50 -07:00
Documentation Merge branch 'jk/notes-merge-config' 2015-08-31 15:39:05 -07:00
ewah Merge branch 'es/osx-header-pollutes-mask-macro' into maint 2015-07-15 11:41:24 -07:00
git-gui
gitk-git
gitweb
mergetools
perl
po po/README: Update directions for l10n contributors 2015-08-17 12:12:26 -07:00
ppc
t Merge branch 'jk/notes-merge-config' 2015-08-31 15:39:05 -07:00
templates
vcs-svn
xdiff
.gitattributes
.gitignore Merge branch 'hv/submodule-config' 2015-08-31 15:38:52 -07:00
.mailmap
abspath.c
aclocal.m4
advice.c
advice.h
alias.c config: silence warnings for command names with invalid keys 2015-08-24 08:52:23 -07:00
alloc.c
archive-tar.c
archive-zip.c
archive.c Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
archive.h
argv-array.c
argv-array.h
attr.c memoize common git-path "constant" files 2015-08-10 15:37:14 -07:00
attr.h
base85.c
bisect.c Merge branch 'dt/refs-pseudo' 2015-08-25 14:57:08 -07:00
bisect.h bisect: simplify the addition of new bisect terms 2015-08-03 11:42:41 -07:00
blob.c
blob.h
branch.c Merge branch 'dt/notes-multiple' 2015-08-25 14:57:08 -07:00
branch.h worktrees: add find_shared_symref 2015-08-11 13:48:15 -07:00
builtin.h builtin-am: implement skeletal builtin am 2015-08-04 22:02:11 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c create_bundle(): duplicate file descriptor to avoid closing it twice 2015-08-10 12:57:14 -07:00
bundle.h
cache-tree.c cache-tree: introduce write_index_as_tree() 2015-08-04 22:02:11 -07:00
cache-tree.h cache-tree: introduce write_index_as_tree() 2015-08-04 22:02:11 -07:00
cache.h Merge branch 'jc/am-state-fix' 2015-08-31 15:39:03 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt Merge branch 'nd/multiple-work-trees' 2015-07-13 14:02:02 -07:00
commit-slab.h Merge branch 'jc/commit-slab' 2015-08-03 11:01:21 -07:00
commit.c Merge branch 'jc/commit-slab' 2015-08-03 11:01:21 -07:00
commit.h Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
config.c Merge branch 'jk/fix-alias-pager-config-key-warnings' 2015-08-31 15:38:57 -07:00
config.mak.in
config.mak.uname
configure.ac
connect.c
connect.h
connected.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c credential-cache--daemon: use tempfile module 2015-08-12 14:50:11 -07:00
credential-cache.c
credential-store.c lockfile: add accessors get_lock_file_fd() and get_lock_file_fp() 2015-08-10 12:57:14 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c write_file(): drop caller-supplied LF from calls to create a one-liner file 2015-08-25 12:49:19 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'hv/submodule-config' 2015-08-31 15:38:52 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'dt/untracked-subdir' 2015-08-28 12:32:15 -07:00
dir.h
editor.c
entry.c
environment.c Merge branch 'nd/export-worktree' into maint 2015-08-19 14:41:30 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'jk/git-path' 2015-08-19 14:48:56 -07:00
fetch-pack.c memoize common git-path "constant" files 2015-08-10 15:37:14 -07:00
fetch-pack.h
fmt-merge-msg.h fmt-merge-msg: use branch.$name.description 2011-10-07 10:11:47 -07:00
fsck.c Merge branch 'js/fsck-opt' 2015-08-03 11:01:18 -07:00
fsck.h
generate-cmdlist.sh generate-cmdlist: re-implement as shell script 2015-08-25 11:24:31 -07:00
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh bisect: don't mix option parsing and non-trivial code 2015-08-03 11:42:42 -07:00
git-compat-util.h Merge branch 'jk/long-error-messages' 2015-08-25 14:57:06 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'gr/rebase-i-drop-warn' 2015-08-03 11:01:22 -07:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'jv/send-email-selective-smtp-auth' 2015-08-26 15:45:31 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh git-stash: use update-ref --create-reflog instead of creating files 2015-07-21 14:08:49 -07:00
git-submodule.sh
git-svn.perl
GIT-VERSION-GEN Git 2.5.1 2015-08-28 11:19:57 -07:00
git-web--browse.sh
git.c builtin-am: remove redirection to git-am.sh 2015-08-04 22:02:11 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c prefer git_pathdup to git_path in some possibly-dangerous cases 2015-08-10 15:37:12 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'ep/http-configure-ssl-version' 2015-08-26 15:45:31 -07:00
http.h
ident.c
imap-send.c
INSTALL
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c Merge branch 'mh/tempfile' 2015-08-25 14:57:09 -07:00
lockfile.h tempfile: a new module for handling temporary files 2015-08-10 12:57:14 -07:00
log-tree.c Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'hv/submodule-config' 2015-08-31 15:38:52 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h Which merge_file() function do you mean? 2012-12-09 23:05:27 -08:00
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c prefer git_pathdup to git_path in some possibly-dangerous cases 2015-08-10 15:37:12 -07:00
notes-merge.h notes: extract enum notes_merge_strategy to notes-utils.h 2015-08-17 15:36:23 -07:00
notes-utils.c notes: extract parse_notes_merge_strategy to notes-utils 2015-08-17 15:38:32 -07:00
notes-utils.h notes: extract parse_notes_merge_strategy to notes-utils 2015-08-17 15:38:32 -07:00
notes.c
notes.h
object.c
object.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'es/osx-header-pollutes-mask-macro' into maint 2015-07-15 11:41:24 -07:00
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c Merge branch 'jk/fix-alias-pager-config-key-warnings' 2015-08-31 15:38:57 -07:00
parse-options-cb.c
parse-options.c
parse-options.h Merge branch 'sb/parse-options-codeformat' 2015-08-12 14:09:57 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c memoize common git-path "constant" files 2015-08-10 15:37:14 -07:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'mh/tempfile' 2015-08-25 14:57:09 -07:00
README
ref-filter.c Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
ref-filter.h ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname 2015-08-03 10:24:07 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'mh/tempfile' 2015-08-25 14:57:09 -07:00
refs.h Merge branch 'dt/refs-pseudo' 2015-08-25 14:57:08 -07:00
RelNotes Start preparing for 2.5.1 2015-08-19 14:48:13 -07:00
remote-curl.c
remote-testsvn.c
remote.c
remote.h
replace_object.c
rerere.c memoize common git-path "constant" files 2015-08-10 15:37:14 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ad/bisect-cleanup' 2015-08-12 14:09:53 -07:00
revision.h
run-command.c Merge branch 'jk/long-error-messages' 2015-08-25 14:57:06 -07:00
run-command.h find_hook: keep our own static buffer 2015-08-10 15:37:13 -07:00
send-pack.c
send-pack.h
sequencer.c Merge branch 'dt/refs-pseudo' 2015-08-25 14:57:08 -07:00
sequencer.h
server-info.c
setup.c write_file(): drop caller-supplied LF from calls to create a one-liner file 2015-08-25 12:49:19 -07:00
sh-i18n--envsubst.c
sha1_file.c Merge branch 'cb/open-noatime-clear-errno' 2015-08-25 14:57:10 -07:00
sha1_name.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
shallow.c Merge branch 'mh/tempfile' 2015-08-25 14:57:09 -07:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'jh/strbuf-read-use-read-in-full' 2015-08-25 14:57:06 -07:00
strbuf.h Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
streaming.c
streaming.h
string-list.c
string-list.h
submodule-config.c submodule: allow erroneous values for the fetchRecurseSubmodules option 2015-08-19 11:43:10 -07:00
submodule-config.h submodule: allow erroneous values for the fetchRecurseSubmodules option 2015-08-19 11:43:10 -07:00
submodule.c Merge branch 'jc/am-state-fix' 2015-08-31 15:39:03 -07:00
submodule.h submodule: allow erroneous values for the fetchRecurseSubmodules option 2015-08-19 11:43:10 -07:00
symlinks.c
tag.c
tag.h gpg-interface: move parse_signature() to where it should be 2014-09-15 13:23:20 -07:00
tar.h
tempfile.c register_tempfile(): new function to handle an existing temporary file 2015-08-10 12:57:14 -07:00
tempfile.h register_tempfile(): new function to handle an existing temporary file 2015-08-10 12:57:14 -07:00
test-chmtime.c
test-config.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-dump-split-index.c
test-dump-untracked-cache.c
test-genrandom.c
test-hashmap.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1-array.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-submodule-config.c submodule: use new config API for worktree configurations 2015-08-19 11:43:10 -07:00
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
trace.h
trailer.c Merge branch 'cc/trailers-corner-case-fix' 2015-08-28 12:32:17 -07:00
trailer.h
transport-helper.c transport-helper: die on errors reading refs. 2015-08-03 13:03:58 -07:00
transport.c write_file(): drop caller-supplied LF from calls to create a one-liner file 2015-08-25 12:49:19 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jk/git-path' 2015-08-19 14:48:56 -07:00
unpack-trees.h
update_unicode.sh
upload-pack.c
url.c
url.h
urlmatch.c
urlmatch.h
usage.c vreportf: avoid intermediate buffer 2015-08-11 14:29:36 -07:00
userdiff.c userdiff: add support for Fountain documents 2015-07-23 14:44:51 -07:00
userdiff.h
utf8.c
utf8.h Merge branch 'es/utf8-stupid-compiler-workaround' 2015-06-24 12:21:46 -07:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c write_file_v(): do not leave incomplete line at the end 2015-08-25 12:48:39 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'sg/wt-status-header-inclusion' 2015-08-26 15:45:38 -07:00
wt-status.h wt-status: move #include "pathspec.h" to the header 2015-08-21 14:49:27 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c

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

	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 version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/giteveryday.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 (read
Documentation/SubmittingPatches for instructions on patch submission).
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://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.