A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Kaartic Sivaraam 52668846ea builtin/branch: stop supporting the "--set-upstream" option
The '--set-upstream' option of branch was deprecated in b347d06b
("branch: deprecate --set-upstream and show help if we detect
possible mistaken use", 2012-08-30) and has been planned for removal
ever since.

In order to prevent "--set-upstream" on a command line from being taken as
an abbreviated form of "--set-upstream-to", explicitly catch "--set-upstream"
option and die, instead of just removing it from the list of options.

Before this change, an attempt to use "--set-upstream" resulted in:

    $ git branch
    * master

    $ git branch --set-upstream origin/master
    The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
    Branch origin/master set up to track local branch master.

    $ echo $?
    0

    $ git branch
    * master
      origin/master

With this change, the behaviour becomes like this:

    $ git branch
    * master

    $ git branch --set-upstream origin/master
    fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.

    $ echo $?
    128

    $ git branch
    * master

Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-17 13:33:20 -07:00
.github
Documentation builtin/branch: stop supporting the "--set-upstream" option 2017-08-17 13:33:20 -07:00
block-sha1
builtin builtin/branch: stop supporting the "--set-upstream" option 2017-08-17 13:33:20 -07:00
ci
compat Merge branch 'rs/bswap-ubsan-fix' 2017-08-11 13:26:57 -07:00
contrib Merge branch 'eb/contacts-reported-by' 2017-08-11 13:27:06 -07:00
ewah use DIV_ROUND_UP 2017-07-10 14:24:36 -07:00
git-gui Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows 2017-07-25 13:42:41 -07:00
gitk-git
gitweb Merge branch 'hb/gitweb-project-list' 2017-08-11 13:27:01 -07:00
mergetools
perl Merge branch 'pw/unquote-path-in-git-pm' 2017-07-10 13:42:50 -07:00
po l10n: zh_CN: review for git v2.14.0 l10n 2017-08-02 08:02:37 +08:00
ppc
refs
sha1collisiondetection@19d97bf5af
sha1dc
t builtin/branch: stop supporting the "--set-upstream" option 2017-08-17 13:33:20 -07:00
templates Merge branch 'ks/prepare-commit-msg-sample' 2017-08-11 13:26:56 -07:00
vcs-svn
xdiff
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml
COPYING
GIT-VERSION-GEN Start post 2.14 cycle 2017-08-04 12:44:55 -07:00
INSTALL
LGPL-2.1
Makefile git-gui (MinGW): make use of MSys2's msgfmt 2017-07-25 12:32:14 -07:00
README.md
RelNotes The first batch of topics after the 2.14 cycle 2017-08-11 13:34:31 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c Merge branch 'js/alias-case-sensitivity' 2017-07-20 16:29:59 -07:00
alloc.c
apply.c Merge branch 'rs/move-array' 2017-08-11 13:26:57 -07:00
apply.h
archive-tar.c
archive-zip.c
archive.c sha1_name: convert get_sha1* to get_oid* 2017-07-17 13:54:51 -07:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c bisect: convert bisect_checkout to struct object_id 2017-07-17 13:54:38 -07:00
bisect.h
blame.c Merge branch 'js/blame-lib' 2017-07-31 13:05:15 -07:00
blame.h
blob.c
blob.h
branch.c
branch.h
builtin.h git.c: provide setup_auto_pager() 2017-08-03 11:08:10 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
cache-tree.h
cache.h Merge branch 'ls/filter-process-delayed' 2017-08-11 13:27:00 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c color: check color.ui in git_default_config() 2017-07-13 12:42:51 -07:00
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c Merge branch 'rs/move-array' 2017-08-11 13:26:57 -07:00
commit.h commit: convert lookup_commit_graft to struct object_id 2017-07-13 12:02:40 -07:00
common-main.c
config.c Merge branch 'sb/hashmap-cleanup' 2017-08-11 13:27:01 -07:00
config.h submodule: convert submodule config lookup to use object_id 2017-07-17 13:54:37 -07:00
config.mak.in
config.mak.uname config.mak.uname: set FREAD_READS_DIRECTORIES for cygwin 2017-07-21 11:58:06 -07:00
configure.ac
connect.c Git 2.13.5 2017-08-04 12:40:37 -07:00
connect.h
connected.c
connected.h
convert.c Merge branch 'jt/subprocess-handshake' 2017-08-11 13:27:05 -07:00
convert.h Merge branch 'ls/filter-process-delayed' 2017-08-11 13:27:00 -07:00
copy.c
credential-cache--daemon.c
credential-cache.c Merge branch 'dl/credential-cache-socket-in-xdg-cache' 2017-08-11 13:27:06 -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 color: check color.ui in git_default_config() 2017-07-13 12:42:51 -07: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 'rs/stat-data-unaligned-reads-fix' 2017-08-11 13:26:58 -07:00
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c commit: convert lookup_commit_graft to struct object_id 2017-07-13 12:02:40 -07:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'pw/unquote-path-in-git-pm' into maint 2017-07-31 13:51:05 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'rs/move-array' 2017-08-11 13:26:57 -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-p4: filter for {'code':'info'} in p4CmdList 2017-07-13 10:52:42 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh
git-rebase--merge.sh
git-rebase.sh rebase: make resolve message clearer for inexperienced users 2017-07-17 14:58:19 -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
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c git.c: ignore pager.* when launching builtin as dashed external 2017-08-03 11:08:11 -07:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'mb/reword-autocomplete-message' into maint 2017-07-10 13:59:04 -07:00
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' 2017-08-11 13:26:59 -07:00
http.h
ident.c
imap-send.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
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 Convert remaining callers of get_sha1 to get_oid. 2017-07-17 13:54:51 -07:00
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 use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c sha1_name: convert get_sha1* to get_oid* 2017-07-17 13:54:51 -07:00
notes.h
object.c object: remove "used" field from struct object 2017-07-20 14:54:08 -07:00
object.h object: remove "used" field from struct object 2017-07-20 14:54:08 -07:00
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'jc/pack-bitmap-unaligned' into maint 2017-07-10 13:59:00 -07:00
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Git 2.13.5 2017-08-04 12:40:37 -07:00
path.h
pathspec.c
pathspec.h
pkt-line.c sub-process: refactor handshake to common function 2017-07-26 13:00:40 -07:00
pkt-line.h sub-process: refactor handshake to common function 2017-07-26 13:00:40 -07:00
preload-index.c
pretty.c pretty: respect color settings for %C placeholders 2017-07-13 12:42:51 -07:00
prio-queue.c
prio-queue.h
progress.c progress: show overall rate in last update 2017-07-09 09:54:20 -07:00
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
ref-filter.c ref-filter: consult want_color() before emitting colors 2017-07-13 12:42:51 -07:00
ref-filter.h ref-filter: consult want_color() before emitting colors 2017-07-13 12:42:51 -07:00
reflog-walk.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
reflog-walk.h reflog-walk: apply --since/--until to reflog dates 2017-07-09 10:00:48 -07:00
refs.c Merge branch 'cc/ref-is-hidden-microcleanup' 2017-08-11 13:27:03 -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 remote: convert struct push_cas to struct object_id 2017-07-17 13:54:38 -07:00
replace_object.c
repository.c submodule: convert submodule config lookup to use object_id 2017-07-17 13:54:37 -07:00
repository.h
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jk/rev-list-empty-input' 2017-08-11 13:27:07 -07:00
revision.h revision: add rev_input_given flag 2017-08-02 15:45:20 -07:00
run-command.c Merge branch 'js/run-process-parallel-api-fix' 2017-08-11 13:27:02 -07:00
run-command.h
send-pack.c
send-pack.h
sequencer.c sha1_name: convert get_sha1* to get_oid* 2017-07-17 13:54:51 -07:00
sequencer.h
server-info.c
setup.c Merge branch 'js/alias-early-config' into maint 2017-07-10 13:58:58 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'ew/fd-cloexec-fix' into maint 2017-07-21 15:03:40 -07:00
sha1_name.c sha1_name: convert uses of 40 to GIT_SHA1_HEXSZ 2017-07-17 13:54:51 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c commit: convert lookup_commit_graft to struct object_id 2017-07-13 12:02:40 -07:00
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/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
strbuf.h strbuf: use designated initializers in STRBUF_INIT 2017-07-14 08:32:44 -07:00
streaming.c
streaming.h
string-list.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
string-list.h
sub-process.c Merge branch 'jt/subprocess-handshake' 2017-08-11 13:27:05 -07:00
sub-process.h Merge branch 'jt/subprocess-handshake' 2017-08-11 13:27:05 -07:00
submodule-config.c Merge branch 'sb/hashmap-cleanup' 2017-08-11 13:27:01 -07:00
submodule-config.h Merge branch 'bc/object-id' 2017-08-11 13:26:55 -07:00
submodule.c Merge branch 'bc/object-id' 2017-08-11 13:26:55 -07:00
submodule.h Merge branch 'bc/object-id' 2017-08-11 13:26:55 -07:00
symlinks.c
tag.c tag: convert gpg_verify_tag to use struct object_id 2017-07-13 12:02:48 -07:00
tag.h tag: convert gpg_verify_tag to use struct object_id 2017-07-13 12:02:48 -07:00
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 sha1_name: convert get_sha1* to get_oid* 2017-07-17 13:54:51 -07:00
transport.c
transport.h
tree-diff.c Merge branch 'bw/object-id' 2017-08-11 13:26:56 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode_width.h unicode: update the width tables to Unicode 10 2017-07-07 10:33:30 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'ls/filter-process-delayed' 2017-08-11 13:27:00 -07:00
unpack-trees.h
upload-pack.c
url.c
url.h
urlmatch.c urlmatch: use hex2chr() in append_normalized_escapes() 2017-07-09 09:43:01 -07:00
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 Merge branch 'rs/wt-status-cleanup' 2017-07-12 15:18:23 -07:00
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