A fork of Git containing Microsoft-specific patches.

Перейти к файлу

Thomas Gummerer bba067d2fa stash: don't delete untracked files that match pathspec Currently when 'git stash push -- <pathspec>' is used, untracked files that match the pathspec will be deleted, even though they do not end up in a stash anywhere. This is because the original commit introducing the pathspec feature in git stash push (`df6bba0937` ("stash: teach 'push' (and 'create_stash') to honor pathspec", 2017-02-28)) used the sequence of 'git reset <pathspec> && git ls-files --modified <pathspec> \| git checkout-index && git clean <pathspec>'. The intention was to emulate what 'git reset --hard -- <pathspec>' would do. The call to 'git clean' was supposed to clean up the files that were unstaged by 'git reset'. This would work fine if the pathspec doesn't match any files that were untracked before 'git stash push -- <pathspec>'. However if <pathspec> matches a file that was untracked before invoking the 'stash' command, all untracked files matching the pathspec would inadvertently be deleted as well, even though they wouldn't end up in the stash, and are therefore lost. This behaviour was never what was intended, only blobs that also end up in the stash should be reset to their state in HEAD, previously untracked files should be left alone. To achieve this, first match what's in the index and what's in the working tree by adding all changes to the index, ask diff-index what changed between HEAD and the current index, and then apply that patch in reverse to get rid of the changes, which includes removal of added files and resurrection of removed files. Reported-by: Reid Price <reid.price@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2018-01-08 13:02:25 -08:00
.github	…
Documentation	Prepare for 2.15.2	2017-12-06 09:10:35 -08:00
block-sha1	…
builtin	Merge branch 'tz/notes-error-to-stderr' into maint	2017-12-06 09:09:04 -08: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
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	…
mergetools	…
perl	…
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	stash: don't delete untracked files that match pathspec	2018-01-08 13:02:25 -08:00
templates	…
vcs-svn	…
xdiff	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
.clang-format	…
.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	…
COPYING	…
GIT-VERSION-GEN	Start preparation for 2.15.1	2017-11-15 12:05:22 +09:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'js/mingw-full-version-in-resources' into maint	2017-11-15 12:05:03 +09:00
README.md	…
RelNotes	Prepare for 2.15.2	2017-12-06 09:10:35 -08:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
apply.c	Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint	2017-12-06 09:09:03 -08:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
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	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	…
check-builtins.sh	…
check-racy.c	…
check_bindir	…
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.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	…
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'ma/ts-cleanups' into maint	2017-10-23 14:19:02 +09:00
convert.h	…
copy.c	…
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-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	…
environment.c	…
exec_cmd.c	…
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	…
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	…
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
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	…
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	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	stash: don't delete untracked files that match pathspec	2018-01-08 13:02:25 -08:00
git-submodule.sh	…
git-svn.perl	…
git-web--browse.sh	…
git.c	…
git.rc	mingw: include the full version information in the resources	2017-11-01 13:43:52 +09:00
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
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.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
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
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	…
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: 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	…
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.c	…
mergesort.c	…
mergesort.h	…
mru.c	…
mru.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object.c	…
object.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	…
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	…
packfile.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'ao/path-use-xmalloc'	2017-10-28 10:18:40 +09:00
path.h	…
pathspec.c	…
pathspec.h	…
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	…
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	…
ref-filter.c	…
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'jk/write-in-full-fix' into maint	2017-10-23 14:37:22 +09:00
refs.h	…
remote-curl.c	…
remote-testsvn.c	…
remote.c	…
remote.h	…
replace_object.c	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	…
run-command.c	…
run-command.h	…
send-pack.c	…
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	…
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-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
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
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' 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	…
streaming.h	…
string-list.c	…
string-list.h	…
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	…
submodule-config.h	…
submodule.c	…
submodule.h	…
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	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
trace.h	…
trailer.c	…
trailer.h	…
transport-helper.c	Merge branch 'jk/write-in-full-fix' into maint	2017-10-23 14:37:22 +09:00
transport.c	…
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	…
unpack-trees.h	…
upload-pack.c	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	Merge branch 'ik/userdiff-html-h-element-fix' into maint	2017-10-18 14:19:02 +09:00
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	Merge branch 'nd/worktree-kill-parse-ref' into maint	2017-10-23 14:14:16 +09:00
worktree.h	…
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	…

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