A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Paul Tan 44b228985e git-credential-store: support XDG_CONFIG_HOME
Add $XDG_CONFIG_HOME/git/credentials to the default credential search
path of git-credential-store. This allows git-credential-store to
support user-specific configuration files in accordance with the XDG
base directory specification[1].

[1] http://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html

~/.git-credentials has a higher precedence than
$XDG_CONFIG_HOME/git/credentials when looking up credentials.  This
means that if any duplicate matching credentials are found in the xdg
file (due to ~/.git-credentials being updated by old versions of git or
outdated tools), they will not be used at all. This is to give the user
some leeway in switching to old versions of git while keeping the xdg
directory. This is consistent with the behavior of git-config.

However, the higher precedence of ~/.git-credentials means that as long
as ~/.git-credentials exist, all credentials will be written to the
~/.git-credentials file even if the user has an xdg file as having a
~/.git-credentials file indicates that the user wants to preserve
backwards-compatibility. This is also consistent with the behavior of
git-config.

To make this precedence explicit in docs/git-credential-store, add a new
section FILES that lists out the credential file paths in their order of
precedence, and explain how the ordering affects the lookup, storage and
erase operations.

Also, update the documentation for --file to briefly explain the
operations on multiple files if the --file option is not provided.

Since the xdg file will not be used unless it actually exists, to
prevent the situation where some credentials are present in the xdg file
while some are present in the home file, users are recommended to not
create the xdg file if they require compatibility with old versions of
git or outdated tools. Note, though, that "erase" can be used to
explicitly erase matching credentials from all files.

Helped-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-24 08:08:02 -07:00
Documentation git-credential-store: support XDG_CONFIG_HOME 2015-03-24 08:08:02 -07:00
block-sha1
builtin Merge branch 'ak/cat-file-clean-up' 2015-01-22 13:46:38 -08:00
compat Merge branch 'dm/compat-s-ifmt-for-zos' 2014-12-22 12:27:16 -08:00
contrib Merge branch 'tf/prompt-preserve-exit-status' 2015-01-14 12:35:49 -08:00
ewah
git-gui
gitk-git
gitweb gitweb: hack around CGI's list-context param() handling 2014-11-18 11:23:10 -08:00
mergetools mergetools: stop setting $status in merge_cmd() 2014-11-21 11:27:53 -08:00
perl Git::SVN: handle missing ref_id case correctly 2015-01-15 08:35:55 +00:00
po l10n: ca.po: Fix trailing whitespace 2015-01-30 15:02:34 -07:00
ppc
t Merge branch 'js/t1050' 2015-01-22 13:46:45 -08:00
templates pre-push.sample: remove unnecessary and misleading IFS=' ' 2014-12-22 10:27:42 -08:00
vcs-svn
xdiff
.gitattributes
.gitignore
.mailmap
COPYING
GIT-VERSION-GEN Git 2.3 2015-02-05 13:23:56 -08:00
INSTALL git-imap-send: use libcurl for implementation 2014-11-10 09:17:27 -08:00
LGPL-2.1
Makefile configure.ac: check for HMAC_CTX_cleanup 2015-01-09 15:33:57 -08:00
README
RelNotes Prepare for 2.2.2 2014-12-22 12:20:38 -08:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c tree.c: update read_tree_recursive callback to pass strbuf as base 2014-12-01 11:32:29 -08:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c Merge branch 'jc/merge-bases' 2015-01-07 12:55:05 -08:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'dm/compat-s-ifmt-for-zos' 2014-12-22 12:27:16 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c parse_color: fix return value for numeric color values 0-8 2015-01-20 15:56:03 -08:00
color.h parse_color: recognize "no$foo" to clear the $foo attribute 2014-11-20 12:42:55 -08:00
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c Merge branch 'jc/merge-bases' 2015-01-07 12:55:05 -08:00
commit.h Merge branch 'jc/merge-bases' 2015-01-07 12:55:05 -08:00
config.c Merge branch 'rs/maint-config-use-labs' into maint 2014-12-22 12:17:23 -08:00
config.mak.in
config.mak.uname configure.ac: check for clock_gettime and CLOCK_MONOTONIC 2015-01-09 15:33:39 -08:00
configure.ac configure.ac: check for HMAC_CTX_cleanup 2015-01-09 15:33:57 -08:00
connect.c Merge branch 'mh/simplify-repack-without-refs' 2014-12-22 12:26:50 -08:00
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c git-credential-store: support XDG_CONFIG_HOME 2015-03-24 08:08:02 -07:00
credential.c Merge branch 'jk/credential-quit' 2014-12-22 12:27:20 -08:00
credential.h credential: let helpers tell us to quit 2014-12-04 10:11:12 -08:00
csum-file.c
csum-file.h Merge branch 'jk/pack-bitmap' 2014-12-12 14:31:42 -08:00
ctype.c
daemon.c
date.c Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint 2015-01-12 14:01:18 -08:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c
dir.h
editor.c
entry.c
environment.c Sync with v2.0.5 2014-12-17 11:42:28 -08:00
exec_cmd.c Merge branch 'jc/exec-cmd-system-path-leak-fix' 2014-12-22 12:27:01 -08:00
exec_cmd.h system_path(): always return free'able memory to the caller 2014-11-30 16:39:47 -08:00
fast-import.c
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c Merge branch 'js/fsck-tag-validation' 2014-12-22 12:27:41 -08:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl add--interactive: leave main loop on read error 2014-12-15 10:12:20 -08:00
git-am.sh git-am: add --message-id/--no-message-id 2014-11-25 15:27:01 -08:00
git-archimport.perl
git-bisect.sh bisect: parse revs before passing them to check_expected_revs() 2014-12-29 11:19:55 -08:00
git-compat-util.h Merge branch 'rh/autoconf-rhel3' 2015-01-14 12:37:21 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh difftool--helper: add explicit exit statement 2014-11-21 11:27:53 -08:00
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool--lib: remove use of $status global 2014-11-21 11:27:53 -08:00
git-mergetool.sh mergetool: simplify conditionals 2014-11-21 11:27:53 -08:00
git-p4.py
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Show number of TODO items for interactive rebase 2014-12-10 13:17:38 -08:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'lh/send-email-hide-x-mailer' 2015-01-07 13:07:27 -08:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-login' 2014-12-22 12:26:48 -08:00
git-stash.sh
git-submodule.sh
git-svn.perl git-svn: make it play nicely with submodules 2015-01-15 08:35:55 +00:00
git-web--browse.sh
git.c Merge branch 'ak/fewer-includes' 2015-01-14 12:37:19 -08:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c http-push: trim trailing newline from remote symref 2015-01-14 10:28:02 -08:00
http-walker.c
http.c
http.h
ident.c
imap-send.c imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY 2015-01-06 12:18:32 -08:00
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 rev-list: add an option to mark fewer edges as uninteresting 2014-12-29 09:57:55 -08:00
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
mailmap.c mailmap: use higher level string list functions 2014-12-04 15:10:21 -08:00
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'jc/merge-bases' 2015-01-07 12:55:05 -08:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'jc/merge-bases' 2015-01-07 12:55:05 -08:00
notes-merge.h
notes-utils.c use strbuf_complete_line() for adding a newline if needed 2014-12-12 11:23:45 -08:00
notes-utils.h
notes.c Merge branch 'mh/simplify-repack-without-refs' 2014-12-22 12:26:50 -08:00
notes.h
object.c
object.h
pack-bitmap-write.c Merge branch 'jk/pack-bitmap' 2014-12-12 14:31:42 -08:00
pack-bitmap.c Merge branch 'jk/pack-bitmap' 2014-12-12 14:31:42 -08:00
pack-bitmap.h pack-bitmap: do not use gcc packed attribute 2014-11-30 18:07:34 -08:00
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 Sync with v2.1.4 2014-12-17 11:46:57 -08:00
pathspec.c
pathspec.h
pkt-line.c pkt-line: allow writing of LARGE_PACKET_MAX buffers 2014-12-10 13:09:21 -08:00
pkt-line.h
preload-index.c
pretty.c
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c Merge branch 'jk/credential-quit' 2014-12-22 12:27:20 -08:00
prompt.h
quote.c ls-tree: remove path filtering logic in show_tree 2014-12-01 11:32:34 -08:00
quote.h ls-tree: remove path filtering logic in show_tree 2014-12-01 11:32:34 -08:00
reachable.c
reachable.h
read-cache.c Sync with v2.1.4 2014-12-17 11:46:57 -08:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jk/read-packed-refs-without-path-max' into maint 2015-01-12 14:02:54 -08:00
refs.h repack_without_refs(): make the refnames argument a string_list 2014-11-25 10:09:58 -08:00
remote-curl.c
remote-testsvn.c
remote.c Merge branch 'jc/checkout-local-track-report' 2015-01-07 12:41:00 -08:00
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository' 2015-01-12 11:38:57 -08:00
revision.h rev-list: add an option to mark fewer edges as uninteresting 2014-12-29 09:57:55 -08:00
run-command.c Merge branch 'jc/hook-cleanup' 2014-12-22 12:27:10 -08:00
run-command.h Merge branch 'jc/hook-cleanup' 2014-12-22 12:27:10 -08:00
send-pack.c pack-objects: use --objects-edge-aggressive for shallow repos 2014-12-29 09:58:25 -08:00
send-pack.h
sequencer.c Merge branch 'cc/interpret-trailers-more' 2014-12-22 12:26:24 -08:00
sequencer.h Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more 2014-11-10 09:56:39 -08:00
server-info.c update-server-info: create info/* with mode 0666 2015-01-06 13:46:52 -08:00
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c sort_string_list(): rename to string_list_sort() 2014-11-25 10:11:34 -08:00
sha1_name.c Merge branch 'mh/find-uniq-abbrev' into maint 2015-01-12 14:02:05 -08:00
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 'jc/strbuf-add-lines-avoid-sp-ht-sequence' 2015-01-07 12:49:19 -08:00
strbuf.h
streaming.c
streaming.h
string-list.c Merge branch 'sb/string-list' 2014-12-22 12:27:30 -08:00
string-list.h Merge branch 'sb/string-list' 2014-12-22 12:27:30 -08:00
submodule.c Merge branch 'jc/merge-bases' 2015-01-07 12:55:05 -08:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-config.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-dump-split-index.c
test-genrandom.c
test-hashmap.c Merge branch 'js/test-hashmap-squelch-gcc' 2014-12-22 12:27:46 -08:00
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
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-array.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 configure.ac: check for clock_gettime and CLOCK_MONOTONIC 2015-01-09 15:33:39 -08:00
trace.h
trailer.c Merge branch 'cc/interpret-trailers-more' 2014-12-22 12:26:24 -08:00
trailer.h
transport-helper.c
transport.c transport: simplify duplicating a substring in transport_get() using xmemdupz() 2014-12-29 09:39:23 -08:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c tree.c: update read_tree_recursive callback to pass strbuf as base 2014-12-01 11:32:29 -08:00
tree.h tree.c: update read_tree_recursive callback to pass strbuf as base 2014-12-01 11:32:29 -08:00
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Sync with v2.2.1 2014-12-18 12:30:53 -08:00
unpack-trees.h
update_unicode.sh update_unicode.sh: delete the command group 2014-12-22 10:03:37 -08:00
upload-pack.c pack-objects: use --objects-edge-aggressive for shallow repos 2014-12-29 09:58:25 -08:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c Merge branch 'maint-2.1' into maint 2015-01-07 13:28:10 -08:00
utf8.h utf8: add is_hfs_dotgit() helper 2014-12-17 11:04:39 -08:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c use args member of struct child_process 2014-11-10 10:04:13 -08:00
wt-status.h
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/giteveryday.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.