1
0
mirror of https://github.com/git/git.git synced 2024-10-20 02:58:26 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Kyle Meyer 58ebd936cc gitworkflows: fix grammar in 'Merge upwards' rule
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-06-12 10:19:48 -07:00
.github
block-sha1
builtin Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
ci travis-ci: fix running P4 and Git LFS tests in Linux build jobs 2017-11-02 11:05:28 +09:00
compat Merge branch 'tz/fsf-address-update' into maint 2017-11-21 14:05:32 +09:00
contrib Merge branch 'tz/complete-branch-copy' into maint 2017-12-06 09:09:02 -08:00
Documentation gitworkflows: fix grammar in 'Merge upwards' rule 2018-06-12 10:19:48 -07:00
ewah Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
git-gui Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-update 2017-11-09 13:24:43 +09:00
gitk-git
gitweb Merge branch 'js/gitweb-raw-blob-link-in-history' 2017-08-26 22:55:07 -07:00
mergetools
perl Merge branch 'jc/perl-git-comment-typofix' into maint 2017-09-10 17:02:57 +09:00
po l10n: Update Catalan translation 2017-10-29 10:04:12 +08:00
ppc
refs Merge branch 'mh/avoid-rewriting-packed-refs' into maint 2017-12-06 09:08:50 -08:00
sha1collisiondetection@19d97bf5af
sha1dc
t Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
templates Merge branch 'ma/up-to-date' 2017-09-10 17:08:22 +09:00
vcs-svn Merge branch 'jn/vcs-svn-cleanup' into maint 2017-09-10 17:03:09 +09:00
xdiff Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
.clang-format clang-format: add a comment about the meaning/status of the 2017-10-02 13:17:48 +09:00
.gitattributes
.gitignore
.gitmodules
.mailmap mailmap: use Kaartic Sivaraam's new address 2017-11-03 23:00:07 +09:00
.travis.yml travis-ci: don't build Git for the static analysis job 2017-11-02 11:05:30 +09:00
.tsan-suppressions
abspath.c real_path: clarify return value ownership 2017-09-27 09:13:47 +09:00
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'rs/archive-excluded-directory' 2017-09-25 15:24:07 +09:00
archive.h
argv-array.c
argv-array.h
attr.c hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
attr.h
base85.c
bisect.c bisect: fix memory leak when returning best element 2017-11-06 10:15:29 +09:00
bisect.h bisect: change calling-convention of find_bisection() 2017-11-06 10:15:29 +09:00
blame.c
blame.h
blob.c
blob.h
branch.c Merge branch 'nd/worktree-kill-parse-ref' into maint 2017-10-23 14:14:16 +09:00
branch.h
builtin.h
bulk-checkin.c distinguish error versus short read from read_in_full() 2017-09-27 15:45:24 +09:00
bulk-checkin.h
bundle.c leak_pending: use object_array_clear(), not free() 2017-09-24 10:05:57 +09:00
bundle.h
cache-tree.c cleanup: fix possible overflow errors in binary search 2017-10-10 08:57:24 +09:00
cache-tree.h
cache.h Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
check_bindir
check-builtins.sh
check-racy.c
color.c Merge branch 'jk/ref-filter-colors-fix' 2017-10-18 10:19:08 +09:00
color.h
column.c column: do not include pager.c 2017-10-24 10:19:06 +09:00
column.h
combine-diff.c
command-list.txt
commit-slab.h commit-slab.h: avoid -Wsign-compare warnings 2017-09-22 13:00:36 +09:00
commit.c reduce_heads: fix memory leaks 2017-11-08 11:34:00 +09:00
commit.h reduce_heads: fix memory leaks 2017-11-08 11:34:00 +09:00
common-main.c
config.c Merge branch 'sd/branch-copy' into maint 2017-12-06 09:09:01 -08:00
config.h Merge branch 'sd/branch-copy' 2017-10-03 15:42:48 +09:00
config.mak.in
config.mak.uname packed_ref_cache: keep the packed-refs file mmapped if possible 2017-09-25 18:02:45 +09:00
configure.ac
connect.c connect: release strbuf on error return in git_connect() 2017-09-07 08:49:27 +09:00
connect.h
connected.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
connected.h
convert.c Merge branch 'ma/ts-cleanups' into maint 2017-10-23 14:19:02 +09:00
convert.h Merge branch 'tb/apply-with-crlf' into maint 2017-09-10 17:02:55 +09:00
copy.c
COPYING
credential-cache--daemon.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c prefer "!=" when checking read_in_full() result 2017-09-27 15:45:24 +09:00
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c Merge branch 'mk/diff-delta-avoid-large-offset' 2017-09-28 14:47:56 +09:00
diff-lib.c object_array: use object_array_clear(), not free() 2017-09-24 10:06:01 +09:00
diff-no-index.c
diff.c Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maint 2017-11-15 12:04:59 +09:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'js/submodule-in-excluded' into maint 2017-11-15 12:04:54 +09:00
dir.h
editor.c
entry.c Merge branch 'ls/filter-process-delayed' 2017-10-11 14:52:24 +09:00
environment.c Merge branch 'jk/no-optional-locks' 2017-10-03 15:42:49 +09:00
exec_cmd.c git_extract_argv0_path: do nothing without RUNTIME_PREFIX 2017-09-07 09:41:14 +09:00
exec_cmd.h
fast-import.c Merge branch 'jk/write-in-full-fix' into maint 2017-10-23 14:37:22 +09:00
fetch-pack.c oidmap: map with OID as key 2017-10-01 17:18:03 +09:00
fetch-pack.h
fmt-merge-msg.h
fsck.c Merge branch 'rs/fsck-null-return-from-lookup' 2017-10-11 14:52:23 +09:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl archimport: use safe_pipe_capture for user input 2017-09-12 11:08:15 +09:00
git-bisect.sh
git-compat-util.h Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: shell-quote variable used in backticks 2017-09-12 11:10:22 +09:00
git-cvsserver.perl cvsserver: use safe_pipe_capture for constant commands as well 2017-09-11 14:52:29 +09:00
git-difftool--helper.sh
git-filter-branch.sh Merge branch 'dg/filter-branch-filter-order-doc' 2017-10-19 14:45:45 +09:00
git-instaweb.sh
git-merge-octopus.sh Merge branch 'ma/up-to-date' 2017-09-10 17:08:22 +09:00
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 rebase: use mboxrd format to avoid split errors 2017-11-18 12:30:16 +09:00
git-rebase--interactive.sh Merge branch 'ad/rebase-i-serie-typofix' into maint 2017-11-21 14:05:32 +09:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'tz/redirect-fix' into maint 2017-12-06 09:09:04 -08:00
git-remote-testgit.sh
git-request-pull.sh request-pull: capitalise "Git" to make it a proper noun 2017-10-03 13:11:57 +09:00
git-send-email.perl send-email: don't use Mail::Address, even if available 2017-08-24 14:40:17 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'mf/no-dashed-subcommands' into maint 2017-09-10 17:02:56 +09:00
git-submodule.sh Sync with Git 2.13.7 2018-05-22 14:10:49 +09:00
git-svn.perl
GIT-VERSION-GEN Git 2.15.2 2018-05-22 14:15:59 +09:00
git-web--browse.sh
git.c Merge branch 'jk/no-optional-locks' 2017-10-03 15:42:49 +09:00
git.rc mingw: include the full version information in the resources 2017-11-01 13:43:52 +09:00
gpg-interface.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
gpg-interface.h
graph.c graph: use strbuf_addchars() to add spaces 2017-10-02 13:14:07 +09:00
graph.h
grep.c Merge branch 'ab/pcre-v2' into maint 2017-11-21 14:05:30 +09:00
grep.h Merge branch 'ab/pcre-v2' into maint 2017-11-21 14:05:30 +09:00
hash.h
hashmap.c hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
hashmap.h hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
help.c
help.h
hex.c
http-backend.c Merge branch 'rs/resolve-ref-optional-result' 2017-09-28 14:47:56 +09:00
http-fetch.c
http-push.c Merge branch 'tg/memfixes' 2017-10-07 16:27:54 +09:00
http-walker.c pack: move find_sha1_pack() 2017-08-23 15:12:07 -07:00
http.c curl_trace(): eliminate switch fallthrough 2017-09-22 12:49:55 +09:00
http.h
ident.c
imap-send.c Merge branch 'rs/imap-send-next-arg-fix' into maint 2017-11-27 10:57:00 +09:00
INSTALL
iterator.h
khash.h
kwset.c Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
kwset.h Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c ALLOC_GROW: avoid -Wsign-compare warnings 2017-09-22 13:21:11 +09:00
line-log.h ALLOC_GROW: avoid -Wsign-compare warnings 2017-09-22 13:21:11 +09:00
line-range.c
line-range.h
list-objects.c
list-objects.h
list.h tempfile: use list.h for linked list 2017-09-06 17:19:54 +09:00
ll-merge.c avoid "write_in_full(fd, buf, len) != len" pattern 2017-09-14 15:17:59 +09:00
ll-merge.h
lockfile.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
lockfile.h lockfile: update lifetime requirements in documentation 2017-09-06 17:19:54 +09:00
log-tree.c log: handle broken HEAD in decoration check 2017-10-21 21:29:37 +09:00
log-tree.h
mailinfo.c Merge branch 'rs/mailinfo-qp-decode-fix' into maint 2017-10-18 14:19:03 +09:00
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'js/mingw-full-version-in-resources' into maint 2017-11-15 12:05:03 +09:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c merge-recursive: handle addition of submodule on our side of history 2017-11-15 12:42:34 +09:00
merge-recursive.h merge-recursive: change current file dir string_lists to hashmap 2017-09-08 10:36:16 +09:00
merge.c
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
notes-cache.c
notes-cache.h
notes-merge.c notes-merge: drop dead zero-write code 2017-09-26 12:55:59 +09:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c Merge branch 'mh/notes-cleanup' 2017-09-19 10:47:52 +09:00
notes.h
object.c object_array: add and use object_array_pop() 2017-09-24 10:06:04 +09:00
object.h object_array: add and use object_array_pop() 2017-09-24 10:06:04 +09:00
oidmap.c oidmap: map with OID as key 2017-10-01 17:18:03 +09:00
oidmap.h oidmap: map with OID as key 2017-10-01 17:18:03 +09:00
oidset.c oidmap: map with OID as key 2017-10-01 17:18:03 +09:00
oidset.h oidmap: map with OID as key 2017-10-01 17:18:03 +09:00
pack-bitmap-write.c pack-bitmap[-write]: use object_array_clear(), don't leak 2017-09-24 10:06:08 +09:00
pack-bitmap.c Merge branch 'ma/leakplugs' 2017-09-29 11:23:43 +09:00
pack-bitmap.h
pack-check.c pack: move open_pack_index(), parse_pack_index() 2017-08-23 15:12:06 -07:00
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c avoid looking at errno for short read_in_full() returns 2017-09-27 15:45:24 +09:00
pack.h
packfile.c cleanup: fix possible overflow errors in binary search 2017-10-10 08:57:24 +09:00
packfile.h pack: move for_each_packed_object() 2017-08-23 15:12:07 -07:00
pager.c
parse-options-cb.c
parse-options.c parse-options: only insert newline in help text if needed 2017-09-25 14:35:53 +09:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
path.h
pathspec.c pathspec doc: parse_pathspec does not maintain references to args 2017-09-21 14:05:00 +09:00
pathspec.h pathspec doc: parse_pathspec does not maintain references to args 2017-09-21 14:05:00 +09:00
pkt-line.c Merge branch 'jk/write-in-full-fix' into maint 2017-10-23 14:37:22 +09:00
pkt-line.h
preload-index.c
pretty.c pretty.c: delimit "%(trailers)" arguments with "," 2017-10-02 09:22:52 +09:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c consistently use "fallthrough" comments in switches 2017-09-22 12:49:57 +09:00
quote.h
reachable.c Merge branch 'nd/prune-in-worktree' 2017-09-19 10:47:53 +09:00
reachable.h
read-cache.c Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
README.md
ref-filter.c Merge branch 'tb/show-trailers-in-ref-filter' 2017-10-11 14:52:22 +09:00
ref-filter.h
reflog-walk.c refs: pass NULL to resolve_refdup() if hash is not needed 2017-10-01 17:27:14 +09:00
reflog-walk.h
refs.c Merge branch 'jk/write-in-full-fix' into maint 2017-10-23 14:37:22 +09:00
refs.h Merge branch 'sd/branch-copy' 2017-10-03 15:42:48 +09:00
RelNotes Git 2.14.4 2018-05-22 14:12:02 +09:00
remote-curl.c
remote-testsvn.c
remote.c refs: pass NULL to resolve_ref_unsafe() if hash is not needed 2017-09-24 10:18:21 +09:00
remote.h
replace_object.c
repository.c repository: use FREE_AND_NULL 2017-10-02 13:15:59 +09:00
repository.h
rerere.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'rj/no-sign-compare' 2017-09-29 11:23:42 +09:00
revision.h Merge branch 'ma/leakplugs' 2017-09-29 11:23:43 +09:00
run-command.c run-command: use ALLOC_ARRAY 2017-10-03 08:42:57 +09:00
run-command.h
send-pack.c consistently use "fallthrough" comments in switches 2017-09-22 12:49:57 +09:00
send-pack.h
sequencer.c Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint 2017-12-06 09:09:03 -08:00
sequencer.h
server-info.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
setup.c Merge branch 'js/early-config' into maint 2017-11-15 12:05:01 +09:00
sh-i18n--envsubst.c Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
sha1_file.c Merge branch 'jk/info-alternates-fix' into maint 2017-11-21 14:05:31 +09:00
sha1_name.c Merge branch 'jc/check-ref-format-oor' into maint 2017-11-15 12:04:57 +09:00
sha1-array.c
sha1-array.h
sha1-lookup.c cleanup: fix possible overflow errors in binary search 2017-10-10 08:57:24 +09:00
sha1-lookup.h sha1-lookup: remove sha1_entry_pos() from header file 2017-08-25 09:54:26 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'ma/leakplugs' 2017-09-29 11:23:43 +09:00
shell.c shell: drop git-cvsserver support by default 2017-09-12 11:05:58 +09:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'rs/strbuf-getwholeline-fix' into maint 2017-10-18 14:18:58 +09:00
strbuf.h Merge branch 'ma/ts-cleanups' into maint 2017-10-23 14:19:02 +09:00
streaming.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
streaming.h
string-list.c cleanup: fix possible overflow errors in binary search 2017-10-10 08:57:24 +09:00
string-list.h string-list.h: move documentation from Documentation/api/ into header 2017-09-27 09:14:34 +09:00
sub-process.c Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint 2017-10-18 14:19:10 +09:00
sub-process.h
submodule-config.c Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
submodule-config.h Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
submodule.c Merge branch 'sb/submodule-diff-header-fix' 2017-10-03 15:42:49 +09:00
submodule.h Merge branch 'hn/typofix' 2017-09-28 14:47:52 +09:00
symlinks.c
tag.c Merge branch 'rs/tag-null-pointer-arith-fix' 2017-10-05 13:48:20 +09:00
tag.h
tar.h
tempfile.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
tempfile.h tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
trace.h
trailer.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
trailer.h Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
transport-helper.c Merge branch 'jk/write-in-full-fix' into maint 2017-10-23 14:37:22 +09:00
transport.c refs: pass NULL to resolve_refdup() if hash is not needed 2017-10-01 17:27:14 +09:00
transport.h
tree-diff.c
tree-walk.c Merge branch 'rj/no-sign-compare' 2017-09-29 11:23:42 +09:00
tree-walk.h
tree.c
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'ls/convert-filter-progress' 2017-09-10 17:08:22 +09:00
unpack-trees.h
upload-pack.c Merge branch 'ma/leakplugs' 2017-09-29 11:23:43 +09:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c add UNLEAK annotation for reducing leak false positives 2017-09-08 15:43:17 +09:00
userdiff.c Merge branch 'ik/userdiff-html-h-element-fix' into maint 2017-10-18 14:19:02 +09:00
userdiff.h
utf8.c Sync with Git 2.14.4 2018-05-22 14:15:14 +09:00
utf8.h is_hfs_dotgit: match other .git files 2018-05-21 23:50:11 -04:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'nd/worktree-kill-parse-ref' into maint 2017-10-23 14:14:16 +09:00
worktree.h revision.c: --all adds HEAD from all worktrees 2017-08-24 14:56:43 -07:00
wrap-for-bin.sh
wrapper.c wrapper.c: consistently quote filenames in error messages 2017-11-06 11:53:14 +09:00
write_or_die.c
ws.c
wt-status.c Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint 2017-11-21 14:05:29 +09:00
wt-status.h
xdiff-interface.c xdiff-interface: export comparing and hashing strings 2017-10-26 11:23:22 +09:00
xdiff-interface.h xdiff-interface: export comparing and hashing strings 2017-10-26 11:23:22 +09:00
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