Go to file
Junio C Hamano 5bbbd576f5 Merge branch 'jk/am-i-resolved-fix' into maint
"git am -i --resolved" segfaulted after trying to see a commit as
if it were a tree, which has been corrected.

* jk/am-i-resolved-fix:
  am: fix --interactive HEAD tree resolution
  am: drop tty requirement for --interactive
  am: read interactive input from stdin
  am: simplify prompt response handling
2019-07-25 14:27:09 -07:00
.github
Documentation Git 2.22-rc3 2019-06-03 11:25:12 -07:00
block-sha1
builtin Merge branch 'jk/am-i-resolved-fix' into maint 2019-07-25 14:27:09 -07:00
ci Merge branch 'sg/ci-libsvn-perl' 2019-05-19 16:45:31 +09:00
compat Merge branch 'tt/no-ipv6-fallback-for-winxp' 2019-05-19 16:45:32 +09:00
contrib list-objects-filter: disable 'sparse:path' filters 2019-05-29 11:05:34 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
perl
po Merge branch 'fr_review' of git://github.com/jnavila/git 2019-06-07 16:51:09 +08:00
ppc *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
refs
sha1collisiondetection@855827c583 sha1dc: update from upstream 2019-05-14 16:45:01 +09:00
sha1dc sha1dc: update from upstream 2019-05-14 16:45:01 +09:00
sha256
t Merge branch 'jk/am-i-resolved-fix' into maint 2019-07-25 14:27:09 -07:00
templates
trace2 Merge branch 'sg/trace2-rename' 2019-05-30 10:50:45 -07:00
vcs-svn *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
xdiff
.clang-format
.editorconfig
.gitattributes
.gitignore Merge branch 'js/misc-doc-fixes' 2019-05-09 00:37:27 +09:00
.gitmodules
.mailmap
.travis.yml
.tsan-suppressions
COPYING
GIT-VERSION-GEN Git 2.22 2019-06-07 09:39:21 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jk/cocci-batch' 2019-05-19 16:45:28 +09:00
README.md
RelNotes
abspath.c
aclocal.m4
advice.c
advice.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
alias.c
alias.h
alloc.c
alloc.h
apply.c
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'en/merge-directory-renames' 2019-05-09 00:37:22 +09:00
archive.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
argv-array.c
argv-array.h
attr.c
attr.h
azure-pipelines.yml
banned.h
base85.c
bisect.c
bisect.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
blame.c Merge branch 'en/merge-directory-renames' 2019-05-09 00:37:22 +09:00
blame.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
blob.c
blob.h
branch.c Merge branch 'dl/branch-from-3dot-merge-base' 2019-05-19 16:45:28 +09:00
branch.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
builtin.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
bulk-checkin.c
bulk-checkin.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'js/fsmonitor-refresh-after-discarding-index' 2019-05-19 16:45:33 +09:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check_bindir
checkout.c
checkout.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
color.c
color.h
column.c
column.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
combine-diff.c
command-list.txt
commit-graph.c Merge branch 'js/commit-graph-parse-leakfix' 2019-05-19 16:45:28 +09:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'tb/unexpected' 2019-05-09 00:37:25 +09:00
commit.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
common-main.c
config.c Merge branch 'jh/trace2-sid-fix' 2019-05-13 23:50:31 +09:00
config.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'id/windows-dep-aslr' 2019-05-19 16:45:27 +09:00
configure.ac
connect.c
connect.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
connected.c
connected.h
convert.c
convert.h
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
ctype.c
daemon.c
date.c
decorate.c
decorate.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
delta-islands.c
delta-islands.h
delta.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
detect-compiler
diff-delta.c
diff-lib.c
diff-no-index.c Merge branch 'nd/diff-parseopt-4' 2019-04-25 16:41:12 +09:00
diff.c i18n: fix typos found during l10n for git 2.22.0 2019-06-03 11:10:53 -07:00
diff.h Merge branch 'nd/diff-parseopt' 2019-05-30 10:50:44 -07:00
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 'jk/untracked-cache-more-fixes' 2019-05-09 00:37:28 +09:00
dir.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
editor.c
entry.c
environment.c
exec-cmd.c
exec-cmd.h *.[ch]: remove extern from function declarations using sed 2019-05-05 15:20:08 +09:00
fast-import.c Merge branch 'bc/hash-transition-16' 2019-04-25 16:41:17 +09:00
fetch-negotiator.c
fetch-negotiator.h
fetch-object.c
fetch-object.h
fetch-pack.c Merge branch 'jt/clone-server-option' 2019-05-30 10:50:46 -07:00
fetch-pack.h
fmt-merge-msg.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
fsck.c
fsck.h
fsmonitor.c fsmonitor: force a refresh after the index was discarded 2019-05-08 12:03:48 +09:00
fsmonitor.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
gettext.c
gettext.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'cc/access-on-aix-workaround' 2019-05-13 23:50:35 +09:00
git-cvsexportcommit.perl cvsexportcommit: force crlf translation 2019-05-07 18:23:27 +09:00
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh mergetool: use get_merge_tool function 2019-05-13 23:11:59 +09:00
git-filter-branch.sh
git-instaweb.sh
git-legacy-stash.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh Merge branch 'dl/difftool-mergetool' 2019-05-19 16:45:30 +09:00
git-mergetool.sh mergetool: use get_merge_tool function 2019-05-13 23:11:59 +09:00
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--common.sh
git-rebase--preserve-merges.sh
git-request-pull.sh
git-send-email.perl Merge branch 'bs/sendemail-tighten-anything-by' 2019-04-25 16:41:25 +09:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh Merge branch 'km/empty-repo-is-still-a-repo' 2019-05-09 00:37:23 +09:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'js/misc-doc-fixes' 2019-05-09 00:37:27 +09:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c grep: fail if call could output and name is null 2019-05-28 10:57:07 -07:00
grep.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
hash.h
hashmap.c
hashmap.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
help.c
help.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
hex.c
http-backend.c
http-fetch.c
http-push.c Merge branch 'cb/http-push-null-in-message-fix' 2019-05-19 16:45:35 +09:00
http-walker.c Merge branch 'bc/hash-transition-16' 2019-04-25 16:41:17 +09:00
http.c Make fread/fwrite-like functions in http.c more like fread/fwrite. 2019-05-08 12:15:25 +09:00
http.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
ident.c Merge branch 'ps/stash-in-c' 2019-04-22 11:14:43 +09:00
imap-send.c
interdiff.c
interdiff.h
iterator.h
json-writer.c
json-writer.h
khash.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
kwset.c
kwset.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
levenshtein.c
levenshtein.h
line-log.c Merge branch 'en/merge-directory-renames' 2019-05-09 00:37:22 +09:00
line-log.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c list-objects-filter: disable 'sparse:path' filters 2019-05-29 11:05:34 -07:00
list-objects-filter-options.h list-objects-filter: disable 'sparse:path' filters 2019-05-29 11:05:34 -07:00
list-objects-filter.c list-objects-filter: disable 'sparse:path' filters 2019-05-29 11:05:34 -07:00
list-objects-filter.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
log-tree.c
log-tree.h
ls-refs.c upload-pack: strip namespace from symref data 2019-05-28 10:02:00 -07:00
ls-refs.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
mailinfo.c
mailinfo.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
mailmap.c
mailmap.h
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
merge-recursive.c Merge branch 'en/merge-directory-renames-fix' 2019-06-06 14:03:36 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c midx: add packs to packed_git linked list 2019-05-07 13:48:42 +09:00
midx.h midx: pass a repository pointer 2019-05-07 13:48:41 +09:00
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c Merge branch 'en/merge-directory-renames' 2019-05-09 00:37:22 +09:00
notes.h notes: correct documentation of format_display_notes() 2019-05-07 19:08:10 +09:00
object-store.h Merge branch 'ds/object-info-for-prefetch-fix' into maint 2019-07-25 14:27:08 -07:00
object.c
object.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
oidmap.c
oidmap.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'bc/hash-transition-16' 2019-04-25 16:41:17 +09:00
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
packfile.c Merge branch 'mh/import-transport-fd-fix' into maint 2019-07-25 14:27:07 -07:00
packfile.h Merge branch 'nd/sha1-name-c-wo-the-repository' 2019-05-09 00:37:25 +09:00
pager.c
parse-options-cb.c Merge branch 'nd/diff-parseopt' 2019-05-30 10:50:44 -07:00
parse-options.c Merge branch 'nd/diff-parseopt' 2019-05-30 10:50:44 -07:00
parse-options.h Merge branch 'js/parseopt-unknown-cb-returns-an-enum' 2019-05-19 16:45:34 +09:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
pathspec.c
pathspec.h
pkt-line.c pkt-line: drop 'const'-ness of a param to set_packet_header() 2019-05-16 13:29:06 +09:00
pkt-line.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
preload-index.c
pretty.c
pretty.h
prio-queue.c
prio-queue.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
progress.c Merge branch 'sg/progress-off-by-one-fix' 2019-05-30 10:50:45 -07:00
progress.h Merge branch 'sg/overlong-progress-fix' 2019-04-25 16:41:19 +09:00
prompt.c
prompt.h
protocol.c
protocol.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
quote.c
quote.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
range-diff.c
range-diff.h
reachable.c
reachable.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
read-cache.c Merge branch 'js/fsmonitor-refresh-after-discarding-index' 2019-05-19 16:45:33 +09:00
rebase-interactive.c
rebase-interactive.h
ref-filter.c Merge branch 'dr/ref-filter-push-track-fix' 2019-05-09 00:37:26 +09:00
ref-filter.h
reflog-walk.c
reflog-walk.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
refs.c
refs.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
refspec.c
refspec.h
remote-curl.c i18n: fix typos found during l10n for git 2.22.0 2019-06-03 11:10:53 -07:00
remote-testsvn.c
remote.c Merge branch 'dr/ref-filter-push-track-fix' 2019-05-09 00:37:26 +09:00
remote.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
replace-object.c
replace-object.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
repository.c
repository.h
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
revision.c Merge branch 'jk/revision-rewritten-parents-in-prio-queue' 2019-04-25 16:41:18 +09:00
revision.h
run-command.c
run-command.h *.[ch]: remove extern from function declarations using sed 2019-05-05 15:20:08 +09:00
send-pack.c
send-pack.h
sequencer.c Merge branch 'pw/clean-sequencer-state-upon-final-commit' 2019-05-13 23:50:35 +09:00
sequencer.h Merge branch 'pw/clean-sequencer-state-upon-final-commit' 2019-05-13 23:50:35 +09:00
serve.c
serve.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
server-info.c server-info: do not list unlinked packs 2019-05-28 11:02:52 -07:00
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-file.c Merge branch 'ds/object-info-for-prefetch-fix' into maint 2019-07-25 14:27:08 -07:00
sha1-lookup.c
sha1-lookup.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
sha1-name.c Merge branch 'jk/get-oid-indexed-object-name' 2019-05-19 16:45:35 +09:00
sha1dc_git.c
sha1dc_git.h
shallow.c
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'ps/stash-in-c' 2019-04-22 11:14:43 +09:00
strbuf.h Merge branch 'ps/stash-in-c' 2019-04-22 11:14:43 +09:00
streaming.c
streaming.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
string-list.c
string-list.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
sub-process.c
sub-process.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
submodule-config.c
submodule-config.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
submodule.c Merge branch 'bc/hash-transition-16' 2019-04-25 16:41:17 +09:00
submodule.h
symlinks.c
tag.c
tag.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
tar.h
tempfile.c
tempfile.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
trace2.c Merge branch 'jh/trace2' 2019-05-13 23:50:35 +09:00
trace2.h trace2: rename environment variables to GIT_TRACE2* 2019-05-28 10:20:34 -07:00
trailer.c
trailer.h
transport-helper.c Merge branch 'mh/import-transport-fd-fix' into maint 2019-07-25 14:27:07 -07:00
transport-internal.h
transport.c Merge branch 'jt/clone-server-option' 2019-05-09 00:37:25 +09:00
transport.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
tree-diff.c
tree-walk.c
tree-walk.h Merge branch 'dl/no-extern-in-func-decl' 2019-05-13 23:50:32 +09:00
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jt/batch-fetch-blobs-in-diff' 2019-04-25 16:41:19 +09:00
unpack-trees.h
upload-pack.c Merge branch 'jk/HEAD-symref-in-xfer-namespaces' into maint 2019-07-25 14:27:09 -07:00
upload-pack.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
url.c
url.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
urlmatch.c
urlmatch.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
varint.c
varint.h *.[ch]: remove extern from function declarations using spatch 2019-05-05 15:20:06 +09:00
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'nd/corrupt-worktrees' into maint 2019-07-25 14:27:07 -07:00
worktree.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c Merge branch 'js/rebase-i-label-shown-in-status-fix' 2019-05-19 16:45:33 +09:00
wt-status.h
xdiff-interface.c
xdiff-interface.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
zlib.c

README.md

Build Status

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.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

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