A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Johannes Schindelin 7e097e27d3 legacy-rebase: backport -C<n> and --whitespace=<option> checks
Since 04519d7201 (rebase: validate -C<n> and --whitespace=<mode>
parameters early, 2018-11-14), the built-in rebase validates the -C and
--whitespace arguments early. As this commit also introduced a
regression test for this, and as a later commit introduced the
GIT_TEST_REBASE_USE_BUILTIN mode to run tests, we now have a
"regression" in the scripted version of `git rebase` on our hands.

Backport the validation to fix this.

Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-11-21 13:40:46 +09:00
.github
Documentation Tenth batch for 2.20 2018-11-13 22:37:28 +09:00
block-sha1
builtin rebase: validate -C<n> and --whitespace=<mode> parameters early 2018-11-16 11:52:13 +09:00
ci Merge branch 'sg/travis-install-dependencies' 2018-11-13 22:37:27 +09:00
compat Merge branch 'sh/mingw-safer-compat-poll' 2018-11-13 22:37:24 +09:00
contrib Merge branch 'nd/complete-format-patch' 2018-11-13 22:37:28 +09:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
perl
po
ppc
refs Merge branch 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
sha1collisiondetection@232357eb2e
sha1dc
t rebase: validate -C<n> and --whitespace=<mode> parameters early 2018-11-16 11:52:13 +09:00
templates
vcs-svn
xdiff xdiff: provide a separate emit callback for hunks 2018-11-02 20:43:02 +09:00
.clang-format
.editorconfig
.gitattributes
.gitignore Merge branch 'ag/rebase-i-in-c' 2018-11-02 11:04:53 +09:00
.gitmodules
.mailmap
.travis.yml travis-ci: install packages in 'ci/install-dependencies.sh' 2018-11-02 11:28:19 +09:00
.tsan-suppressions
COPYING
GIT-VERSION-GEN
INSTALL
LGPL-2.1
Makefile Merge branch 'ao/submodule-wo-gitmodules-checked-out' 2018-11-13 22:37:22 +09:00
README.md
RelNotes
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'bc/hash-transition-part-15' 2018-10-30 15:43:42 +09:00
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
banned.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
branch.c
branch.h
builtin.h Merge branch 'ag/rebase-i-in-c' 2018-11-02 11:04:53 +09:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'bp/refresh-index-using-preload' 2018-11-13 22:37:26 +09:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check-racy.c
check_bindir
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/xdiff-interface' 2018-11-13 22:37:27 +09:00
command-list.txt
commit-graph.c
commit-graph.h
commit-reach.c commit-reach: implement get_reachable_subset 2018-11-03 00:12:06 +09:00
commit-reach.h Merge branch 'ds/add-missing-tags' 2018-11-13 22:37:24 +09:00
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'pk/rebase-in-c-4-opts' 2018-11-02 11:04:55 +09:00
commit.h Merge branch 'js/shallow-and-fetch-prune' 2018-11-06 15:50:18 +09:00
common-main.c
config.c Merge branch 'js/mingw-perl5lib' 2018-11-13 22:37:20 +09:00
config.h
config.mak.dev Merge branch 'jk/unused-function' 2018-10-30 15:43:46 +09:00
config.mak.in
config.mak.uname
configure.ac
connect.c
connect.h
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
ctype.c
daemon.c
date.c approxidate: fix NULL dereference in date_time() 2018-11-07 11:04:06 +09:00
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jk/xdiff-interface' 2018-11-13 22:37:27 +09:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c Merge branch 'jk/xdiff-interface' 2018-11-13 22:37:27 +09:00
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c pathspec: handle non-terminated strings with :(attr) 2018-11-02 20:49:53 +09:00
dir.h
editor.c
entry.c
environment.c Merge branch 'js/mingw-perl5lib' 2018-11-13 22:37:20 +09:00
exec-cmd.c
exec-cmd.h
fast-import.c
fetch-negotiator.c
fetch-negotiator.h
fetch-object.c
fetch-object.h
fetch-pack.c fetch-pack: be more precise in parsing v2 response 2018-11-01 14:30:22 +09:00
fetch-pack.h
fmt-merge-msg.h
fsck.c Merge branch 'jc/cocci-preincr' 2018-10-30 15:43:48 +09:00
fsck.h
fsmonitor.c
fsmonitor.h
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h config: allow for platform-specific core.* config settings 2018-10-31 12:46:21 +09:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-legacy-rebase.sh legacy-rebase: backport -C<n> and --whitespace=<option> checks 2018-11-21 13:40:46 +09:00
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--common.sh
git-rebase--merge.sh
git-rebase--preserve-merges.sh Merge branch 'ag/rebase-i-in-c' 2018-11-02 11:04:53 +09:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'nd/complete-format-patch' 2018-11-13 22:37:28 +09:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Merge branch 'ao/submodule-wo-gitmodules-checked-out' 2018-11-13 22:37:22 +09:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'ag/rebase-i-in-c' 2018-11-02 11:04:53 +09:00
git.rc
gpg-interface.c Merge branch 'mg/gpg-fingerprint' 2018-11-03 00:53:58 +09:00
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
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 Merge branch 'jc/http-curlver-warnings' 2018-11-03 00:53:59 +09:00
http.h
ident.c
imap-send.c
interdiff.c
interdiff.h
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.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
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'en/merge-cleanup-more' 2018-11-03 00:53:57 +09:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c Merge branch 'ds/test-multi-pack-index' 2018-11-13 22:37:19 +09:00
midx.h Merge branch 'ds/test-multi-pack-index' 2018-11-13 22:37:19 +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
notes.h
object-store.h
object.c
object.h
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c Merge branch 'bc/hash-transition-part-15' 2018-10-30 15:43:42 +09:00
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c Merge branch 'js/pack-objects-mutex-init-fix' 2018-10-30 15:43:43 +09:00
pack-objects.h Merge branch 'js/pack-objects-mutex-init-fix' 2018-10-30 15:43:43 +09:00
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'ds/test-multi-pack-index' 2018-11-13 22:37:19 +09:00
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 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'mg/gpg-fingerprint' 2018-11-03 00:53:58 +09:00
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
range-diff.c Merge branch 'jk/xdiff-interface' 2018-11-13 22:37:27 +09:00
range-diff.h
reachable.c
reachable.h
read-cache.c Merge branch 'bp/refresh-index-using-preload' 2018-11-13 22:37:26 +09:00
rebase-interactive.c
rebase-interactive.h
ref-filter.c Merge branch 'ot/ref-filter-plug-leaks' 2018-10-30 15:43:45 +09:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
refs.h Merge branch 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
refspec.c
refspec.h
remote-curl.c
remote-testsvn.c
remote.c remote: make add_missing_tags() linear 2018-11-03 00:12:06 +09:00
remote.h
replace-object.c
replace-object.h
repository.c
repository.h
rerere.c Merge branch 'bc/hash-transition-part-15' 2018-10-30 15:43:42 +09:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jk/misc-unused-fixes' 2018-11-13 22:37:26 +09:00
revision.h Merge branch 'md/exclude-promisor-objects-fix' 2018-11-06 15:50:21 +09:00
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'bp/refresh-index-using-preload' 2018-11-13 22:37:26 +09:00
sequencer.h Merge branch 'pw/am-rebase-read-author-script' 2018-11-13 22:37:23 +09:00
serve.c
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-file.c Merge branch 'jk/detect-truncated-zlib-input' 2018-11-13 22:37:17 +09:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'js/shallow-and-fetch-prune' 2018-11-06 15:50:18 +09:00
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'pk/rebase-in-c-3-acts' 2018-11-02 11:04:54 +09:00
strbuf.h Merge branch 'pk/rebase-in-c-3-acts' 2018-11-02 11:04:54 +09:00
streaming.c read_istream_pack_non_delta(): document input handling 2018-10-31 14:32:30 +09:00
streaming.h
string-list.c
string-list.h
sub-process.c
sub-process.h
submodule-config.c Merge branch 'ao/submodule-wo-gitmodules-checked-out' 2018-11-13 22:37:22 +09:00
submodule-config.h
submodule.c Merge branch 'ao/submodule-wo-gitmodules-checked-out' 2018-11-13 22:37:22 +09:00
submodule.h Merge branch 'ao/submodule-wo-gitmodules-checked-out' 2018-11-13 22:37:22 +09: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
trailer.h
transport-helper.c
transport-internal.h
transport.c Merge branch 'nd/submodule-unused-vars' 2018-11-06 15:50:20 +09:00
transport.h
tree-diff.c
tree-walk.c Merge branch 'nd/tree-walk-path-exclusion' 2018-11-13 22:37:28 +09:00
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 Merge branch 'jt/upload-pack-v2-fix-shallow' 2018-11-06 15:50:19 +09:00
upload-pack.h
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 Merge branch 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
worktree.h Merge branch 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c Merge branch 'jk/xdiff-interface' 2018-11-13 22:37:27 +09:00
xdiff-interface.h xdiff-interface: drop parse_hunk_header() 2018-11-05 13:14:35 +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.

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