A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Junio C Hamano e66ef7ae6f Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'
The "--tags" option to "git fetch" used to be literally a synonym to
a "refs/tags/*:refs/tags/*" refspec, which meant that (1) as an
explicit refspec given from the command line, it silenced the lazy
"git fetch" default that is configured, and (2) also as an explicit
refspec given from the command line, it interacted with "--prune"
to remove any tag that the remote we are fetching from does not
have.

This demotes it to an option; with it, we fetch all tags in
addition to what would be fetched without the option, and it does
not interact with the decision "--prune" makes to see what
remote-tracking refs the local has are missing the remote
counterpart.

* mh/fetch-tags-in-addition-to-normal-refs: (23 commits)
  fetch: improve the error messages emitted for conflicting refspecs
  handle_duplicate(): mark error message for translation
  ref_remote_duplicates(): extract a function handle_duplicate()
  ref_remove_duplicates(): simplify loop logic
  t5536: new test of refspec conflicts when fetching
  ref_remove_duplicates(): avoid redundant bisection
  git-fetch.txt: improve description of tag auto-following
  fetch-options.txt: simplify ifdef/ifndef/endif usage
  fetch, remote: properly convey --no-prune options to subprocesses
  builtin/remote.c:update(): use struct argv_array
  builtin/remote.c: reorder function definitions
  query_refspecs(): move some constants out of the loop
  fetch --prune: prune only based on explicit refspecs
  fetch --tags: fetch tags *in addition to* other stuff
  fetch: only opportunistically update references based on command line
  get_expanded_map(): avoid memory leak
  get_expanded_map(): add docstring
  builtin/fetch.c: reorder function definitions
  get_ref_map(): rename local variables
  api-remote.txt: correct section "struct refspec"
  ...
2013-12-12 14:14:10 -08:00
Documentation Merge branch 'mh/fetch-tags-in-addition-to-normal-refs' 2013-12-12 14:14:10 -08:00
block-sha1 block-sha1/sha1.c: have SP around arithmetic operators 2013-10-16 10:27:27 -07:00
builtin Merge branch 'mh/fetch-tags-in-addition-to-normal-refs' 2013-12-12 14:14:10 -08:00
compat C: have space around && and || operators 2013-10-16 10:26:39 -07:00
contrib Merge branch 'rh/remote-hg-bzr-updates' 2013-12-06 11:06:53 -08:00
git-gui Merge git://repo.or.cz/git-gui 2013-12-09 14:57:00 -08:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2013-12-09 14:55:41 -08:00
gitweb
mergetools mergetools/diffmerge: support DiffMerge as a git mergetool 2013-10-13 16:00:57 -07:00
perl
po l10n: de.po: improve error message when pushing to unknown upstream 2013-11-12 06:31:15 +01:00
ppc
t Merge branch 'mh/fetch-tags-in-addition-to-normal-refs' 2013-12-12 14:14:10 -08:00
templates
vcs-svn
xdiff C: have space around && and || operators 2013-10-16 10:26:39 -07:00
.gitattributes
.gitignore Makefile: rebuild perl scripts when perl paths change 2013-11-18 14:30:11 -08:00
.mailmap .mailmap: switch to Thomas Rast's personal address 2013-10-13 14:28:27 -07:00
COPYING
GIT-VERSION-GEN Start 1.9 cycle 2013-12-06 11:20:04 -08:00
INSTALL
LGPL-2.1
Makefile Makefile: add PERLLIB_EXTRA variable that adds to default perl path 2013-11-18 14:30:23 -08:00
README
RelNotes Start 1.9 cycle 2013-12-06 11:20:04 -08:00
abspath.c abspath.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
aclocal.m4
advice.c
advice.h
alias.c alias: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
alloc.c alloc.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive-tar.c
archive-zip.c
archive.c archive.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c base85.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
bisect.c
bisect.h
blob.c
blob.h
branch.c Merge branch 'jh/checkout-auto-tracking' into maint 2013-10-23 13:32:50 -07:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c bundle: use argv-array 2013-11-12 13:32:11 -08:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jc/upload-pack-send-symref' into maint 2013-11-08 11:38:00 -08: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 Merge branch 'jk/robustify-parse-commit' 2013-12-05 12:54:01 -08:00
commit.h Merge branch 'jk/robustify-parse-commit' 2013-12-05 12:54:01 -08:00
config.c config.c: mark file-local function static 2013-10-14 16:00:37 -07:00
config.mak.in
config.mak.uname
configure.ac
connect.c Merge branch 'jc/upload-pack-send-symref' 2013-10-30 12:10:06 -07:00
connect.h Merge branch 'jc/upload-pack-send-symref' 2013-10-30 12:10:06 -07: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
ctype.c
daemon.c
date.c Merge branch 'jk/date-c-double-semicolon' 2013-10-30 12:11:01 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Use the word 'stuck' instead of 'sticked' 2013-10-31 15:47:38 -07:00
diff.h Use the word 'stuck' instead of 'sticked' 2013-10-31 15:47:38 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'jc/ls-files-killed-optim' into maint 2013-10-23 13:33:08 -07:00
dir.h
editor.c
entry.c checkout_entry(): clarify the use of topath[] parameter 2013-10-24 14:59:39 -07:00
environment.c cache: remove unused function 'have_git_dir' 2013-10-28 08:56:06 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c Merge branch 'jk/robustify-parse-commit' 2013-12-05 12:54:01 -08:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl add-interactive: handle unborn branch in patch mode 2013-10-25 14:54:17 -07:00
git-am.sh Merge branch 'jk/replace-perl-in-built-scripts' 2013-12-05 12:58:21 -08:00
git-archimport.perl
git-bisect.sh typofixes: fix misspelt comments 2013-11-12 09:24:27 -08:00
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys' 2013-11-04 14:58:05 -08:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh Merge branch 'lc/filter-branch-too-many-refs' 2013-10-17 15:55:12 -07:00
git-instaweb.sh use @@PERL@@ in built scripts 2013-10-29 12:41:17 -07:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool--lib: Fix typo in the merge/difftool help 2013-10-14 16:28:38 -07:00
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-pull.sh fetch --tags: fetch tags *in addition to* other stuff 2013-10-30 14:16:36 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'es/rebase-i-no-abbrev' into maint 2013-10-17 15:45:50 -07:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh Merge branch 'jk/replace-perl-in-built-scripts' 2013-12-05 12:58:21 -08:00
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'jc/reflog-doc' 2013-10-18 13:50:12 -07:00
git-stash.sh
git-submodule.sh Merge branch 'jl/submodule-update-retire-orig-flags' 2013-12-05 13:00:20 -08:00
git-svn.perl git-svn: Warn about changing default for --prefix in Git v2.0 2013-10-12 22:30:53 +00:00
git-web--browse.sh web--browse: Add support for xdg-open 2013-10-30 13:54:15 -07:00
git.c Merge branch 'sb/repack-in-c' 2013-10-18 13:49:57 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c graph: fix coloring around octopus merges 2013-10-18 12:48:48 -07:00
graph.h
grep.c
grep.h
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c Merge branch 'bc/http-backend-allow-405' into maint 2013-10-17 15:46:00 -07:00
http-fetch.c
http-push.c Merge branch 'jk/http-auth-redirects' into maint 2013-11-08 11:37:26 -08:00
http-walker.c
http.c Merge branch 'bc/http-100-continue' 2013-12-05 12:58:59 -08:00
http.h Merge branch 'bc/http-100-continue' 2013-12-05 12:58:59 -08:00
ident.c Merge branch 'jk/split-broken-ident' into maint 2013-11-07 14:34:51 -08:00
imap-send.c
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'nd/magic-pathspec' 2013-10-30 12:10:33 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Merge branch 'jk/robustify-parse-commit' 2013-12-05 12:54:01 -08:00
log-tree.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'jk/diff-algo' into maint 2013-10-28 10:16:11 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c assume parse_commit checks for NULL commit 2013-10-24 15:43:50 -07:00
notes-utils.h
notes.c
notes.h
object.c Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
object.h Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
pack-check.c
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 Merge branch 'jx/relative-path-regression-fix' 2013-10-28 10:42:30 -07:00
pathspec.c Merge branch 'mi/typofixes' 2013-12-03 11:41:33 -08:00
pathspec.h pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c pretty: trivial style fix 2013-10-31 13:47:41 -07:00
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 Merge branch 'es/name-hash-no-trailing-slash-in-dirs' 2013-10-17 15:55:16 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'sb/refs-code-cleanup' 2013-11-01 07:38:58 -07:00
refs.h Merge branch 'sb/refs-code-cleanup' 2013-11-01 07:38:58 -07:00
remote-curl.c Merge branch 'bc/http-100-continue' 2013-12-05 12:58:59 -08:00
remote-testsvn.c
remote.c Merge branch 'mh/fetch-tags-in-addition-to-normal-refs' 2013-12-12 14:14:10 -08:00
remote.h ref_remove_duplicates(): simplify loop logic 2013-10-30 14:16:41 -07:00
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/ref-excludes' 2013-12-05 12:59:09 -08:00
revision.h Merge branch 'jc/ref-excludes' 2013-12-05 12:59:09 -08:00
run-command.c run-command: trivial style fixes 2013-10-31 13:48:26 -07:00
run-command.h
send-pack.c Merge branch 'jl/pack-transfer-avoid-double-close' 2013-10-30 12:10:45 -07:00
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c setup: trivial style fixes 2013-10-31 13:48:32 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/remove-experimental-loose-object-support' 2013-12-06 11:09:43 -08:00
sha1_name.c Merge branch 'jk/robustify-parse-commit' 2013-12-05 12:54:01 -08:00
shallow.c Merge branch 'jk/robustify-parse-commit' 2013-12-05 12:54:01 -08:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c path-utils test: rename mingw_path function to print_path 2013-10-14 07:32:53 -07:00
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c transport-helper: trivial style fix 2013-10-31 13:47:22 -07:00
transport.c
transport.h
tree-diff.c pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jk/two-way-merge-corner-case-fix' 2013-12-05 12:59:25 -08:00
unpack-trees.h
upload-pack.c Merge branch 'jk/robustify-parse-commit' 2013-12-05 12:54:01 -08:00
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
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c typofixes: fix misspelt comments 2013-11-12 09:24:27 -08:00
write_or_die.c
ws.c
wt-status.c wt-status: take the alignment burden off translators 2013-11-06 12:11:30 -08:00
wt-status.h status: show commit sha1 in "You are currently cherry-picking" message 2013-10-11 10:42:45 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c

README

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, 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

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.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.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).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

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 http://news.gmane.org/gmane.comp.version-control.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.