Go to file
Jeff King e9ce897b9f reset: make tree counting less confusing
Depending on whether we're in --keep mode, git-reset may
feed one or two trees to unpack_trees(). We start a counter
at "1" and then increment it to "2" only for the two-tree
case. But that means we must always subtract one to find the
correct array slot to fill with each descriptor.

Instead, let's start at "0" and just increment our counter
after adding each tree. This skips the extra subtraction,
and will make things much easier when we start to actually
free our tree buffers.

While we're at it, let's make the first allocation use the
slot at "desc + nr", too, even though we know "nr" is 0 at
that point. It makes the two fill_tree_descriptor() calls
consistent (always "desc + nr", followed by always
incrementing "nr").

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-09-06 18:06:26 +09:00
.github
Documentation The sixth batch post 2.14 2017-09-06 13:15:24 +09:00
block-sha1
builtin reset: make tree counting less confusing 2017-09-06 18:06:26 +09:00
ci
compat Merge branch 'rs/bswap-ubsan-fix' into maint 2017-08-23 14:33:46 -07:00
contrib Merge branch 'eb/contacts-reported-by' 2017-08-11 13:27:06 -07:00
ewah
git-gui
gitk-git
gitweb Merge branch 'js/gitweb-raw-blob-link-in-history' 2017-08-26 22:55:07 -07:00
mergetools
outgoing pack: move pack name-related functions 2017-08-23 15:12:06 -07:00
perl Merge branch 'ur/svn-local-zone' 2017-08-22 10:29:07 -07:00
po
ppc
refs Merge branch 'mh/ref-lock-entry' 2017-08-26 22:55:09 -07:00
sha1collisiondetection@19d97bf5af
sha1dc
t test-lib: set LSAN_OPTIONS to abort by default 2017-09-06 18:06:26 +09:00
templates Merge branch 'ks/prepare-commit-msg-sample-fix' 2017-08-23 14:13:07 -07:00
vcs-svn Merge branch 'jn/vcs-svn-cleanup' 2017-08-26 22:55:06 -07:00
xdiff
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml
COPYING
GIT-VERSION-GEN Prepare for 2.14.2 2017-08-23 14:36:03 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jt/packmigrate' 2017-08-26 22:55:09 -07:00
README.md
RelNotes Prepare for 2.14.2 2017-08-23 14:36:03 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c Merge branch 'tb/apply-with-crlf' 2017-08-26 22:55:05 -07:00
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'rs/archive-excluded-directory' 2017-09-06 13:11:25 +09:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
branch.c branch: quote branch/ref names to improve readability 2017-08-17 13:33:28 -07:00
branch.h
builtin.h
bulk-checkin.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jt/packmigrate' 2017-08-26 22:55:09 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c commit: rewrite read_graft_line 2017-08-18 12:41:06 -07:00
commit.h Merge branch 'po/read-graft-line' 2017-09-06 13:11:25 +09:00
common-main.c
config.c Merge branch 'jc/cutoff-config' 2017-08-26 22:55:08 -07:00
config.h Merge branch 'jc/cutoff-config' 2017-08-26 22:55:08 -07:00
config.mak.in
config.mak.uname
configure.ac
connect.c
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 'tb/apply-with-crlf' 2017-08-26 22:55:05 -07:00
convert.h Merge branch 'tb/apply-with-crlf' 2017-08-26 22:55:05 -07:00
copy.c
credential-cache--daemon.c
credential-cache.c Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint 2017-08-23 14:33:45 -07:00
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-no-index.c
diff.c Merge branch 'jt/packmigrate' 2017-08-26 22:55:09 -07:00
diff.h diff: define block by number of alphanumeric chars 2017-08-16 11:44:00 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c progress: simplify "delayed" progress API 2017-08-19 14:01:34 -07:00
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'rs/stat-data-unaligned-reads-fix' into maint 2017-08-23 14:33:48 -07:00
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c pack: move pack name-related functions 2017-08-23 15:12:06 -07:00
fetch-pack.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h pack: move release_pack_memory() 2017-08-23 15:12:06 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
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 Merge branch 'kw/rebase-progress' 2017-08-23 14:13:07 -07:00
git-rebase--interactive.sh
git-rebase--merge.sh
git-rebase.sh Merge branch 'kw/rebase-progress' 2017-08-23 14:13:07 -07:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'kd/stash-with-bash-4.4' 2017-08-23 14:13:08 -07:00
git-submodule.sh Merge branch 'sb/submodule-parallel-update' 2017-08-23 14:13:14 -07:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'bw/grep-recurse-submodules' 2017-08-22 10:29:01 -07:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'as/grep-quiet-no-match-exit-code-fix' 2017-08-23 14:13:12 -07:00
grep.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
http-fetch.c
http-push.c pack: move find_sha1_pack() 2017-08-23 15:12:07 -07:00
http-walker.c pack: move find_sha1_pack() 2017-08-23 15:12:07 -07:00
http.c Merge branch 'jt/packmigrate' 2017-08-26 22:55:09 -07:00
http.h
ident.c
imap-send.c
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c sha1_file: convert index_path to struct object_id 2017-08-20 21:51:38 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c tree-walk: convert fill_tree_descriptor() to object_id 2017-08-14 12:38:54 -07:00
notes.h
object.c
object.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c pack: move open_pack_index(), parse_pack_index() 2017-08-23 15:12:06 -07: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
pack.h
packfile.c pack: move for_each_packed_object() 2017-08-23 15:12:07 -07:00
packfile.h pack: move for_each_packed_object() 2017-08-23 15:12:07 -07:00
pager.c Merge branch 'ma/parse-maybe-bool' 2017-08-22 10:29:03 -07:00
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
prio-queue.c
prio-queue.h
progress.c progress: simplify "delayed" progress API 2017-08-19 14:01:34 -07:00
progress.h progress: simplify "delayed" progress API 2017-08-19 14:01:34 -07:00
prompt.c
prompt.h
quote.c
quote.h
reachable.c pack: move for_each_packed_object() 2017-08-23 15:12:07 -07:00
reachable.h
read-cache.c Merge branch 'kw/write-index-reduce-alloc' 2017-08-26 22:55:08 -07:00
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'mh/ref-lock-entry' 2017-08-26 22:55:09 -07:00
refs.h
remote-curl.c
remote-testsvn.c
remote.c Merge branch 'sb/hashmap-cleanup' 2017-08-11 13:27:01 -07:00
remote.h
replace_object.c
repository.c Merge branch 'bw/grep-recurse-submodules' 2017-08-22 10:29:01 -07:00
repository.h
rerere.c rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved 2017-08-22 14:51:02 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c pack: move has_sha1_pack() 2017-08-23 15:12:07 -07:00
revision.h
run-command.c Merge branch 'js/run-process-parallel-api-fix' into maint 2017-08-23 14:33:49 -07:00
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'pw/sequence-rerere-autoupdate' 2017-08-22 10:29:00 -07: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
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'po/read-graft-line' 2017-09-06 13:11:25 +09:00
sha1_name.c pack: move open_pack_index(), parse_pack_index() 2017-08-23 15:12:06 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c
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 'rs/strbuf-getwholeline-fix' 2017-08-22 10:29:15 -07:00
strbuf.h
streaming.c pack: move use_pack() 2017-08-23 15:12:06 -07:00
streaming.h
string-list.c
string-list.h
sub-process.c Merge branch 'cc/subprocess-handshake-missing-capabilities' 2017-08-24 10:20:02 -07:00
sub-process.h Merge branch 'jt/subprocess-handshake' 2017-08-11 13:27:05 -07:00
submodule-config.c Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
submodule-config.h Merge branch 'bw/grep-recurse-submodules' 2017-08-22 10:29:01 -07:00
submodule.c Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
submodule.h Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trailer.c Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
trailer.h Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
transport-helper.c
transport.c
transport.h
tree-diff.c tree-walk: convert fill_tree_descriptor() to object_id 2017-08-14 12:38:54 -07:00
tree-walk.c tree-walk: convert fill_tree_descriptor() to object_id 2017-08-14 12:38:54 -07:00
tree-walk.h tree-walk: convert fill_tree_descriptor() to object_id 2017-08-14 12:38:54 -07:00
tree.c
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
unpack-trees.h
upload-pack.c
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

README.md

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