1
0
mirror of https://github.com/git/git.git synced 2024-10-21 12:48:32 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Brandon Williams 9d6babb2f9 notes-merge: convert merge_from_diffs to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-05 11:23:58 +09:00
block-sha1
builtin notes-merge: convert notes_merge* to struct object_id 2017-06-05 11:23:58 +09:00
ci Merge branch 'ls/travis-relays-for-windows-ci' 2017-05-23 13:46:04 +09:00
compat winansi: avoid buffer overrun 2017-05-08 12:18:19 +09:00
contrib Merge branch 'tg/stash-push-fixup' 2017-05-29 12:34:52 +09:00
Documentation Fourth batch for 2.14 2017-05-30 11:20:10 +09:00
ewah
git-gui Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
gitk-git
gitweb doc: use https links to Wikipedia to avoid http redirects 2017-05-15 13:04:54 +09:00
mergetools
perl
po Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 2017-05-09 22:12:34 +08:00
ppc
refs Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
sha1dc
t Merge branch 'dt/unpack-save-untracked-cache-extension' 2017-05-30 11:16:45 +09:00
templates
vcs-svn
xdiff
.gitattributes Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
.gitignore
.mailmap
.travis.yml Merge branch 'ab/fix-poison-tests' 2017-05-23 13:46:09 +09:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c Merge branch 'jc/apply-fix-mismerge' 2017-05-16 11:51:59 +09:00
apply.h
archive-tar.c archive-tar: fix a sparse 'constant too large' warning 2017-05-09 11:23:14 +09:00
archive-zip.c Merge branch 'js/larger-timestamps' 2017-05-16 11:51:59 +09:00
archive.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c Merge branch 'jk/update-links-in-docs' 2017-05-29 12:34:48 +09:00
bisect.h
blob.c Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
blob.h Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
branch.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
branch.h
builtin.h
bulk-checkin.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
bulk-checkin.h
bundle.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
bundle.h
cache-tree.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
cache-tree.h
cache.h grep: convert to struct object_id 2017-06-02 09:36:06 +09:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
column.c
column.h
combine-diff.c combine-diff: convert find_paths_* to struct object_id 2017-06-02 09:36:07 +09:00
command-list.txt
commit-slab.h
commit.c Merge branch 'bm/interpret-trailers-cut-line-is-eom' 2017-05-29 12:34:53 +09:00
commit.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
common-main.c
config.c Merge branch 'ab/conditional-config-with-symlinks' 2017-05-30 11:16:44 +09:00
config.mak.in
config.mak.uname
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c convert: update subprocess_read_status() to not die on EOF 2017-05-15 13:01:57 +09:00
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
diff-no-index.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
diff.c diff: convert diff_flush_patch_id to struct object_id 2017-06-02 09:36:07 +09:00
diff.h tree-diff: convert diff_root_tree_sha1 to struct object_id 2017-06-02 09:36:30 +09:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
diffcore.h diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
dir-iterator.c
dir-iterator.h
dir.c
dir.h
editor.c
entry.c
environment.c Merge branch 'jk/bug-to-abort' 2017-05-29 12:34:45 +09:00
exec_cmd.c
exec_cmd.h
fast-import.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
fetch-pack.c Merge branch 'jt/fetch-allow-tip-sha1-implicitly' 2017-05-30 11:16:43 +09:00
fetch-pack.h
fmt-merge-msg.h
fsck.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'bw/forking-and-threading' 2017-05-30 11:16:41 +09:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh git-filter-branch: be more direct in an error message 2017-05-12 15:27:10 +09:00
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 doc: replace more gmane links 2017-05-09 21:13:13 -07:00
git-rebase--merge.sh
git-rebase.sh
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' 2017-05-30 11:16:45 +09:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh
git-svn.perl
GIT-VERSION-GEN Start post 2.13 cycle 2017-05-16 11:52:15 +09:00
git-web--browse.sh
git.c
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
grep.h grep: convert to struct object_id 2017-06-02 09:36:06 +09:00
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'bw/forking-and-threading' 2017-05-30 11:16:41 +09:00
help.h
hex.c
http-backend.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
http-fetch.c
http-push.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
http-walker.c
http.c
http.h
ident.c
imap-send.c
INSTALL
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
line-log.h
line-range.c
line-range.h
list-objects.c Convert lookup_tree to struct object_id 2017-05-08 15:12:57 +09:00
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c tree-diff: convert diff_root_tree_sha1 to struct object_id 2017-06-02 09:36:30 +09:00
log-tree.h
mailinfo.c mailinfo & mailsplit: check for EOF while parsing 2017-05-08 12:18:19 +09:00
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'bp/sub-process-convert-filter' 2017-05-30 11:16:42 +09:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
merge-recursive.h
merge.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c
notes-cache.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
notes-cache.h notes-cache: convert to struct object_id 2017-05-08 15:12:57 +09:00
notes-merge.c notes-merge: convert merge_from_diffs to struct object_id 2017-06-05 11:23:58 +09:00
notes-merge.h notes-merge: convert notes_merge* to struct object_id 2017-06-05 11:23:58 +09:00
notes-utils.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
notes-utils.h builtin/notes: convert to struct object_id 2017-06-02 09:36:06 +09:00
notes.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
notes.h notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
object.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
object.h object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
oidset.c
oidset.h
pack-bitmap-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-bitmap.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
pack-bitmap.h
pack-check.c Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack.h Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pager.c
parse-options-cb.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c tree-diff: convert diff_root_tree_sha1 to struct object_id 2017-06-02 09:36:30 +09:00
patch-ids.h patch-ids: convert to struct object_id 2017-06-02 09:36:07 +09:00
path.c
pathspec.c pathspec: convert find_pathspecs_matching_against_index to take an index 2017-05-12 14:23:46 +09:00
pathspec.h pathspec: convert find_pathspecs_matching_against_index to take an index 2017-05-12 14:23:46 +09:00
pkt-line.c convert: move packet_write_line() into pkt-line as packet_writel() 2017-05-08 10:57:26 +09:00
pkt-line.h pkt-line: annotate packet_writel with LAST_ARG_MUST_BE_NULL 2017-05-15 13:01:36 +09:00
preload-index.c
pretty.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
reachable.h
read-cache.c Merge branch 'dt/unpack-save-untracked-cache-extension' 2017-05-30 11:16:45 +09:00
README.md
ref-filter.c Merge branch 'kn/ref-filter-branch-list' 2017-05-29 12:34:51 +09:00
ref-filter.h Convert struct ref_array_item to struct object_id 2017-05-08 15:12:57 +09:00
reflog-walk.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
reflog-walk.h
refs.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
refs.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
RelNotes Start post 2.13 cycle 2017-05-16 11:52:15 +09:00
remote-curl.c
remote-testsvn.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
remote.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c diff: convert diff_change to struct object_id 2017-06-02 09:36:07 +09:00
revision.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'pw/rebase-i-regression-fix' 2017-05-29 12:34:51 +09:00
sequencer.h
server-info.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
setup.c setup_discovered_git_dir(): plug memory leak 2017-05-08 12:18:19 +09:00
sh-i18n--envsubst.c
sha1_file.c
sha1_name.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
shallow.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c Merge branch 'bw/forking-and-threading' 2017-05-30 11:16:41 +09:00
string-list.h
sub-process.c convert: update subprocess_read_status() to not die on EOF 2017-05-15 13:01:57 +09:00
sub-process.h convert: update subprocess_read_status() to not die on EOF 2017-05-15 13:01:57 +09:00
submodule-config.c
submodule-config.h
submodule.c Merge branch 'bw/pathspec-sans-the-index' 2017-05-30 11:16:40 +09:00
submodule.h Merge branch 'bw/pathspec-sans-the-index' 2017-05-30 11:16:40 +09:00
symlinks.c
tag.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
tag.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c
transport.c
transport.h
tree-diff.c tree-diff: convert diff_root_tree_sha1 to struct object_id 2017-06-02 09:36:30 +09:00
tree-walk.c doc: replace more gmane links 2017-05-09 21:13:13 -07:00
tree-walk.h
tree.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
tree.h tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'dt/unpack-save-untracked-cache-extension' 2017-05-30 11:16:45 +09:00
unpack-trees.h
upload-pack.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c Merge branch 'bw/forking-and-threading' 2017-05-30 11:16:41 +09:00
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
worktree.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'bm/interpret-trailers-cut-line-is-eom' 2017-05-29 12:34:53 +09:00
wt-status.h interpret-trailers: honor the cut line 2017-05-18 15:00:48 +09:00
xdiff-interface.c
xdiff-interface.h
zlib.c

Git - fast, scalable, distributed revision control system

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.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.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).

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 https://public-inbox.org/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.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (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