A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Nguyễn Thái Ngọc Duy c7d93da38e i18n: merge-file: mark parseopt strings for translation
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-08-20 12:23:18 -07:00
Documentation Git 1.7.12 2012-08-19 17:02:11 -07:00
block-sha1 Merge branch 'jn/block-sha1' into maint 2012-08-06 15:40:00 -07:00
builtin i18n: merge-file: mark parseopt strings for translation 2012-08-20 12:23:18 -07:00
compat Merge branch 'bw/maint-1.7.9-solaris-getpass' 2012-08-08 15:14:58 -07:00
contrib Merge branch 'lm/git-blame-el' into maint 2012-08-06 15:37:54 -07:00
git-gui
git_remote_helpers
gitk-git
gitweb Merge branch 'nk/maint-gitweb-log-by-lines' 2012-07-23 20:55:07 -07:00
mergetools
perl git svn: reset invalidates the memoized mergeinfo caches 2012-08-10 19:53:18 +00:00
po l10n: Fixes to Swedish translation 2012-08-16 13:57:51 +01:00
ppc
t Merge branch 'rj/maint-grep-remove-redundant-test' into maint 2012-08-15 13:37:20 -07:00
templates
vcs-svn Merge branch 'jn/vcs-svn' 2012-07-13 15:37:04 -07:00
xdiff Merge branch 'rs/xdiff-fast-hash-fix' 2012-05-25 12:05:02 -07:00
.gitattributes
.gitignore Merge branch 'jn/makefile-cleanup' 2012-07-15 21:39:17 -07:00
.mailmap
COPYING
GIT-VERSION-GEN Git 1.7.12 2012-08-19 17:02:11 -07:00
INSTALL INSTALL: update asciidoc recommendation 2012-05-30 09:07:04 -07:00
LGPL-2.1
Makefile Merge branch 'bw/maint-1.7.9-solaris-getpass' 2012-08-08 15:14:58 -07:00
README
RelNotes Prepare for 1.7.11.5 2012-08-06 15:51:58 -07:00
abspath.c
aclocal.m4
advice.c Merge branch 'jk/maint-advise-vaddf' into maint 2012-07-30 13:05:25 -07:00
advice.h
alias.c
alloc.c
archive-tar.c archive: ustar header checksum is computed unsigned 2012-06-13 10:47:21 -07:00
archive-zip.c
archive.c i18n: archive: mark parseopt strings for translation 2012-08-20 12:23:15 -07:00
archive.h
argv-array.c
argv-array.h
attr.c attr: make sure we have an xdg path before using it 2012-07-24 08:59:07 -07:00
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c Remove i18n legos in notifying new branch tracking setup 2012-06-07 11:46:02 -07:00
branch.h
builtin.h Merge branch 'jk/diff-no-index-pager' into maint 2012-07-11 12:46:21 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c tweak "bundle verify" of a complete history 2012-06-04 16:24:49 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'tg/ce-namelen-field' 2012-07-23 20:55:21 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt Documentation: list git-credential in plumbing commands 2012-08-08 09:59:17 -07:00
commit.c Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
commit.h
config.c Merge branch 'mm/config-xdg' 2012-07-22 12:56:27 -07:00
config.mak.in docs: drop asciidoc7compatible flag 2012-05-30 09:22:43 -07:00
configure.ac build: reconfigure automatically if configure.ac changes 2012-07-19 10:30:26 -07:00
connect.c Merge branch 'hv/remote-end-hung-up' 2012-07-04 23:40:12 -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: convert "url" attribute into its parsed subparts 2012-07-18 13:26:58 -07:00
credential.h git credential fill: output the whole 'struct credential' 2012-06-25 11:56:24 -07:00
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c Merge branch 'jc/maint-filter-branch-epoch-date' into maint 2012-07-30 13:04:18 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c Merge branch 'jc/refactor-diff-stdin' into maint 2012-07-22 13:01:23 -07:00
diff.c Merge branch 'nd/maint-i18n-diffstat' 2012-07-31 09:43:07 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h Merge branch 'jc/refactor-diff-stdin' into maint 2012-07-22 13:01:23 -07:00
dir.c Merge branch 'mm/config-xdg' 2012-07-25 15:47:05 -07:00
dir.h Merge branch 'jc/ls-files-i-dir' into maint 2012-07-11 12:44:35 -07:00
editor.c
entry.c
environment.c git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.h
fixup-builtins
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl git-add--interactive.perl: Remove two unused variables 2012-06-25 10:06:09 -07:00
git-am.sh Merge branch 'jx/i18n-1.7.11' 2012-07-31 09:41:52 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl difftool: only copy back files modified during directory diff 2012-07-19 10:33:44 -07:00
git-filter-branch.sh Merge branch 'jc/maint-filter-branch-epoch-date' into maint 2012-07-30 13:04:18 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool: support --tool-help option like difftool does 2012-07-23 14:42:39 -07:00
git-mergetool.sh mergetool: support --tool-help option like difftool does 2012-07-23 14:42:39 -07:00
git-p4.py Merge branch 'pw/git-p4-move' 2012-07-15 21:38:32 -07:00
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh rebase: don't source git-sh-setup twice 2012-06-26 13:17:50 -07:00
git-rebase--interactive.sh Merge branch 'cw/rebase-i-root' 2012-07-25 15:46:59 -07:00
git-rebase--merge.sh rebase: don't source git-sh-setup twice 2012-06-26 13:17:50 -07:00
git-rebase.sh git-rebase.sh: fix typo in an error message 2012-08-01 13:58:47 -07:00
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh request-pull: really favor a matching tag 2012-06-01 12:38:19 -07:00
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Merge branch 'jx/i18n-1.7.11' 2012-07-31 09:41:52 -07:00
git-svn.perl git svn: handle errors and concurrent commits in dcommit 2012-08-10 19:53:18 +00:00
git-web--browse.sh
git.c add 'git credential' plumbing command 2012-06-25 11:55:51 -07:00
git.spec.in
gpg-interface.c ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT 2012-05-24 17:16:41 -07:00
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'rs/maint-grep-F' into maint 2012-06-01 13:01:41 -07:00
grep.h Merge branch 'rs/maint-grep-F' into maint 2012-06-01 13:01:41 -07:00
hash.c
hash.h
help.c help.c::exclude_cmds(): plug a leak 2012-07-25 11:08:59 -07:00
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c http-push: do not access git_default_email directly 2012-05-22 09:07:52 -07:00
http-walker.c
http.c http: get default user-agent from git_user_agent 2012-06-03 13:11:54 -07:00
http.h
ident.c Merge branch 'jk/ident-gecos-strbuf' 2012-05-29 13:09:13 -07:00
imap-send.c
kwset.c
kwset.h
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c format-patch: refactor get_patch_filename 2012-05-22 09:08:50 -07:00
log-tree.h format-patch: refactor get_patch_filename 2012-05-22 09:08:50 -07:00
mailmap.c
mailmap.h
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c merge-recursive: separate message for common ancestors 2012-08-05 12:34:57 -07:00
merge-recursive.h
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c notes-merge: remove i18n legos in merge result message 2012-06-07 11:58:09 -07:00
notes-merge.h
notes.c
notes.h
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
parse-options.h i18n: mark "style" in OPT_COLUMN() for translation 2012-08-20 12:23:14 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c config: read (but not write) from $XDG_CONFIG_HOME/git/config file 2012-06-25 09:05:55 -07:00
pkt-line.c remove the impression of unexpectedness when access is denied 2012-06-19 13:37:02 -07:00
pkt-line.h remove the impression of unexpectedness when access is denied 2012-06-19 13:37:02 -07:00
preload-index.c
pretty.c Merge branch 'jk/pretty-commit-header-incomplete-line' into maint 2012-06-01 13:01:33 -07:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'tg/ce-namelen-field' 2012-07-23 20:55:21 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'rs/refs-string-slice' 2012-05-29 13:09:02 -07:00
refs.h
remote-curl.c
remote.c Merge branch 'jk/push-delete-ref-error-message' into maint 2012-07-22 13:04:25 -07:00
remote.h add sorting infrastructure for list refs 2012-05-22 13:31:03 -07:00
replace_object.c
rerere.c Merge branch 'ar/clone-honor-umask-at-top' 2012-07-15 21:39:04 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jk/revision-walk-stop-at-max-count' 2012-07-22 12:56:30 -07:00
revision.h Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
run-command.c
run-command.h
send-pack.h
sequencer.c Merge branch 'nh/empty-rebase' 2012-06-01 13:28:19 -07:00
sequencer.h
server-info.c
setup.c Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'hv/link-alt-odb-entry' into maint 2012-08-15 13:36:47 -07:00
sha1_name.c Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
shallow.c
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 Merge branch 'hv/submodule-alt-odb' 2012-05-23 13:35:06 -07:00
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 vcs-svn: drop no-op reset methods 2012-07-05 23:26:51 -05:00
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-subprocess.c
test-svn-fe.c vcs-svn: drop no-op reset methods 2012-07-05 23:26:51 -05:00
thread-utils.c
thread-utils.h
trace.c
transport-helper.c Add explanatory comment for transport-helpers refs mapping. 2012-07-30 12:22:35 -07:00
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c Strip namelen out of ce_flags into a ce_namelen field 2012-07-11 09:42:45 -07:00
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'tg/ce-namelen-field' 2012-07-23 20:55:21 -07:00
unpack-trees.h unpack-trees.c: use path_excluded() in check_ok_to_remove() 2012-06-05 22:21:42 -07:00
upload-pack.c
url.c
url.h
usage.c
userdiff.c
userdiff.h
utf8.c git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
utf8.h git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
varint.c
varint.h
version.c version: add git_user_agent function 2012-06-03 13:11:52 -07:00
version.h version: add git_user_agent function 2012-06-03 13:11:52 -07:00
walker.c
walker.h
wrap-for-bin.sh
wrapper.c ident: report passwd errors with a more friendly message 2012-05-22 09:08:20 -07:00
write_or_die.c
ws.c
wt-status.c status: color in-progress message like other header messages 2012-07-16 09:37:29 -07:00
wt-status.h status: color in-progress message like other header messages 2012-07-16 09:37:29 -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.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

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://marc.theaimsgroup.com/?l=git and other archival
sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.