1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 14:27:54 +01:00
Find a file
Junio C Hamano 2fe2458370 Merge branch 'maint'
* maint:
  t/README: test_must_fail is for testing Git
2013-06-04 15:25:34 -07:00
block-sha1
builtin Merge branch 'tr/line-log' 2013-06-02 16:00:44 -07:00
compat Merge branch 'fc/macos-x-clipped-write' 2013-06-02 15:54:54 -07:00
contrib Merge branch 'fc/completion' 2013-06-02 15:48:12 -07:00
Documentation Update draft release notes to 1.8.4 2013-06-02 16:02:21 -07:00
git-gui
git_remote_helpers git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean" 2013-01-30 12:34:55 -08:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2013-05-17 11:55:02 -07:00
gitweb gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM 2013-04-15 07:25:46 -07:00
mergetools Sync with v1.8.2.3 2013-05-09 13:32:54 -07:00
perl git-svn: added an --include-path flag 2013-05-09 01:13:36 +00:00
po gitk: Update Swedish translation (304t) 2013-05-17 09:25:25 +10:00
ppc
t Merge branch 'maint' 2013-06-04 15:25:34 -07:00
templates templates/hooks--update.sample: use a lowercase "usage:" string 2013-02-24 13:31:09 -08:00
vcs-svn
xdiff Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
.gitattributes
.gitignore git-remote-testgit: build it to run under $SHELL_PATH 2013-04-28 15:22:53 -07:00
.mailmap mailmap: update Pasky's address 2013-04-04 13:03:34 -07:00
abspath.c
aclocal.m4
advice.c branch: give advice when tracking start-point is missing 2013-04-02 16:14:13 -07:00
advice.h branch: give advice when tracking start-point is missing 2013-04-02 16:14:13 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c archive-zip: use deflateInit2() to ask for raw compressed data 2013-03-16 22:07:02 -07:00
archive.c archive: handle commits with an empty tree 2013-03-10 22:25:22 -07:00
archive.h
argv-array.c
argv-array.h
attr.c Merge branch 'lf/read-blob-data-from-index' 2013-04-21 18:39:45 -07:00
attr.h
base85.c
bisect.c Merge branch 'jk/bisect-prn-unsigned' into maint 2013-04-12 13:41:46 -07:00
bisect.h
blob.c
blob.h
branch.c Merge branch 'jh/checkout-auto-tracking' 2013-05-29 14:23:10 -07:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c bundle: Accept prerequisites without commit messages 2013-04-07 14:45:56 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jk/fetch-always-update-tracking' 2013-06-02 15:57:26 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'mk/combine-diff-context-horizon-fix' 2013-06-02 15:56:46 -07:00
command-list.txt
commit.c Sync with 'maint' 2013-04-12 13:54:01 -07:00
commit.h pretty: save commit encoding from logmsg_reencode if the caller needs it 2013-04-18 16:28:27 -07:00
config.c config: allow inaccessible configuration under $HOME 2013-04-15 07:26:50 -07:00
config.mak.in Merge branch 'jc/remove-export-from-config-mak-in' 2013-04-01 09:00:02 -07:00
config.mak.uname Merge branch 'fc/macos-x-clipped-write' 2013-06-02 15:54:54 -07:00
configure.ac Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08:00
connect.c Merge branch 'nd/clone-local-with-colon' 2013-06-02 15:52:22 -07:00
connected.c
connected.h
convert.c Merge branch 'lf/read-blob-data-from-index' 2013-04-21 18:39:45 -07:00
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'jk/pkt-line-cleanup' 2013-04-01 08:59:37 -07:00
date.c Merge branch 'jc/prune-all' 2013-05-29 14:23:04 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jk/diff-algo-finishing-touches' into maint 2013-04-24 16:19:42 -07:00
diff.h Merge branch 'mp/diff-algo-config' 2013-02-17 15:25:52 -08:00
diffcore-break.c diffcore-break: don't divide by zero 2013-04-03 12:48:02 -07:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diffcore-pickaxe: unify code for log -S/-G 2013-04-05 10:31:09 -07:00
diffcore-rename.c Preallocate hash tables when the number of inserts are known in advance 2013-03-16 22:57:29 -07:00
diffcore.h
dir.c Merge branch 'kb/status-ignored-optim-2' 2013-06-03 12:58:56 -07:00
dir.h dir.c: git-status --ignored: don't scan the work tree twice 2013-04-15 12:36:42 -07:00
editor.c
entry.c Merge branch 'jk/check-corrupt-objects-carefully' 2013-04-03 09:34:29 -07:00
environment.c Merge branch 'jk/alias-in-bare' into maint 2013-04-03 09:25:41 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'fc/fast-export-persistent-marks' 2013-06-02 15:48:28 -07:00
fetch-pack.c Merge branch 'jk/pkt-line-cleanup' 2013-04-01 08:59:37 -07:00
fetch-pack.h fetch: use struct ref to represent refs to be fetched 2013-02-07 13:53:59 -08:00
fixup-builtins
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
git-am.sh git-am: show the final log message on "Applying:" indicator 2013-03-21 08:09:35 -07:00
git-archimport.perl git-archimport: use a lowercase "usage:" string 2013-02-24 13:31:06 -08:00
git-bisect.sh bisect: Log possibly bad, skipped commits at bisection end 2013-04-23 09:09:44 -07:00
git-compat-util.h Merge branch 'fc/macos-x-clipped-write' 2013-06-02 15:54:54 -07:00
git-cvsexportcommit.perl git-cvsexportcommit: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-cvsimport.perl git-cvsimport: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-cvsserver.perl Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
git-difftool--helper.sh difftool--helper: fix printf usage 2013-02-10 11:35:50 -08:00
git-difftool.perl difftool: fix dir-diff when file does not exist in working tree 2013-05-17 11:46:53 -07:00
git-filter-branch.sh Merge branch 'jk/filter-branch-come-back-to-original' into maint 2013-04-22 11:26:55 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh Merge branch 'kb/p4merge' 2013-03-26 13:15:24 -07:00
git-merge-resolve.sh
git-mergetool--lib.sh doc: generate a list of valid merge tools 2013-02-02 21:46:52 -08:00
git-mergetool.sh Merge branch 'al/mergetool-printf-fix' 2013-02-14 10:29:37 -08:00
git-p4.py git p4: avoid expanding client paths in chdir 2013-03-11 15:03:11 -07:00
git-parse-remote.sh
git-pull.sh merge/pull: verify GPG signatures of commits being merged 2013-03-31 19:23:59 -07:00
git-quiltimport.sh Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
git-rebase--am.sh rebase-am: explicitly disable cover-letter 2013-04-14 20:01:07 -07:00
git-rebase--interactive.sh bash-prompt.sh: show where rebase is at when stopped 2013-04-25 09:59:34 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'ph/rebase-original' 2013-04-26 15:28:34 -07:00
git-relink.perl git-relink: use a lowercase "usage:" string 2013-02-24 13:31:06 -08:00
git-remote-testgit.sh Merge branch 'js/transport-helper-error-reporting-fix' 2013-05-29 14:20:25 -07:00
git-remote-testpy.py git-remote-testpy: fix path hashing on Python 3 2013-01-28 09:55:14 -08:00
git-repack.sh
git-request-pull.sh
git-send-email.perl send-email: make annotate configurable 2013-04-07 00:42:29 -07:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'kb/p4merge' 2013-03-26 13:15:24 -07:00
git-stash.sh
git-submodule.sh Merge branch 'jl/submodule-deinit' 2013-04-05 14:15:13 -07:00
git-svn.perl git-svn: introduce --parents parameter for commands branch and tag 2013-05-20 22:05:54 +00:00
GIT-VERSION-GEN Start 1.8.3.1 maintenance track 2013-05-29 15:21:15 -07:00
git-web--browse.sh git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS X 2013-03-29 15:24:31 -07:00
git.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
git.spec.in
gpg-interface.c Merge branch 'mg/gpg-interface-using-status' into maint 2013-04-03 09:26:27 -07:00
gpg-interface.h merge/pull Check for untrusted good GPG signatures 2013-03-31 22:38:49 -07:00
graph.c Revert "graph.c: mark private file-scope symbols as static" 2013-03-03 19:43:54 -08:00
graph.h Revert "graph.c: mark private file-scope symbols as static" 2013-03-03 19:43:54 -08:00
grep.c fix clang -Wtautological-compare with unsigned enum 2013-02-25 07:35:55 -08:00
grep.h fix clang -Wtautological-compare with unsigned enum 2013-02-25 07:35:55 -08:00
hash.c
hash.h Preallocate hash tables when the number of inserts are known in advance 2013-03-16 22:57:29 -07:00
help.c help: add help_unknown_ref() 2013-05-08 15:31:54 -07:00
help.h help: add help_unknown_ref() 2013-05-08 15:31:54 -07:00
hex.c
http-backend.c Merge branch 'jk/http-dumb-namespaces' 2013-04-18 11:49:21 -07:00
http-fetch.c
http-push.c http: drop http_error function 2013-04-06 18:56:46 -07:00
http-walker.c
http.c Merge branch 'mv/ssl-ftp-curl' 2013-04-19 13:31:08 -07:00
http.h Merge branch 'mv/ssl-ftp-curl' 2013-04-19 13:31:08 -07:00
ident.c Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint 2013-02-04 10:04:26 -08:00
imap-send.c imap-send: eliminate HMAC deprecation warnings on Mac OS X 2013-05-21 13:26:37 -07:00
INSTALL Typo fix: replacing it's -> its 2013-04-11 17:39:05 -07:00
kwset.c kwset: fix spelling in comments 2013-04-12 12:25:08 -07:00
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c log -L: improve comments in process_all_files() 2013-04-12 11:37:09 -07:00
line-log.h log -L: store the path instead of a diff_filespec 2013-04-12 11:37:03 -07:00
line-range.c log -L: :pattern:file syntax to find by funcname 2013-03-28 10:30:04 -07:00
line-range.h log -L: :pattern:file syntax to find by funcname 2013-03-28 10:30:04 -07:00
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Merge branch 'tr/line-log' 2013-06-02 16:00:44 -07:00
log-tree.h pretty: share code between format_decoration and show_decorations 2013-04-18 16:28:27 -07:00
mailmap.c
mailmap.h
Makefile Merge branch 'tr/line-log' 2013-06-02 16:00:44 -07:00
match-trees.c match-trees: simplify score_trees() using tree_entry() 2013-03-25 09:00:30 -07:00
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c Sync with 1.8.1 maintenance track 2013-04-03 09:18:01 -07:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes.c
notes.h
object.c Merge branch 'jk/lookup-object-prefer-latest' 2013-05-29 14:29:59 -07:00
object.h avoid segfaults on parse_object failure 2013-03-17 12:49:03 -07:00
pack-check.c
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c prune: introduce OPT_EXPIRY_DATE() and use it 2013-04-25 11:42:10 -07:00
parse-options.c Merge branch 'ef/non-ascii-parse-options-error-diag' into maint 2013-02-27 10:04:26 -08:00
parse-options.h Merge branch 'jc/prune-all' 2013-05-29 14:23:04 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c path.c: optimize adjust_shared_perm() 2013-04-05 12:39:38 -07:00
pathspec.c
pathspec.h
pkt-line.c pkt-line: share buffer/descriptor reading implementation 2013-02-24 00:14:15 -08:00
pkt-line.h pkt-line: share buffer/descriptor reading implementation 2013-02-24 00:14:15 -08:00
preload-index.c
pretty.c Merge branch 'rs/pp-user-info-without-extra-allocation' 2013-05-01 15:24:08 -07:00
progress.c strbuf: create strbuf_humanise_bytes() to show byte sizes 2013-04-10 12:58:33 -07:00
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c use parse_object_or_die instead of die("bad object") 2013-03-17 12:52:14 -07:00
reachable.h
read-cache.c Merge branch 'lf/read-blob-data-from-index' 2013-04-21 18:39:45 -07:00
README Merge branch 'ta/doc-no-small-caps' 2013-02-05 16:13:32 -08:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'mh/packed-refs-various' 2013-05-29 14:23:49 -07:00
refs.h Merge branch 'mh/packed-refs-various' 2013-05-29 14:23:49 -07:00
RelNotes Start 1.8.4 cycle 2013-05-29 15:19:12 -07:00
remote-curl.c remote-curl: die directly with http error messages 2013-04-06 18:56:45 -07:00
remote-testsvn.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
remote.c remote.c: introduce branch.<name>.pushremote 2013-04-02 10:41:43 -07:00
remote.h remote.c: introduce a way to have different remotes for fetch/push 2013-04-02 10:41:42 -07:00
replace_object.c
rerere.c rerere forget: do not segfault if not all stages are present 2013-04-04 12:27:28 -07:00
rerere.h
resolve-undo.c checkout: avoid unnecessary match_pathspec calls 2013-03-27 08:53:15 -07:00
resolve-undo.h checkout: avoid unnecessary match_pathspec calls 2013-03-27 08:53:15 -07:00
revision.c Merge branch 'tr/line-log' 2013-06-02 16:00:44 -07:00
revision.h Merge branch 'tr/line-log' 2013-06-02 16:00:44 -07:00
run-command.c Merge branch 'jk/a-thread-only-dies-once' into maint 2013-04-26 11:25:59 -07:00
run-command.h
send-pack.c pkt-line: provide a LARGE_PACKET_MAX static buffer 2013-02-20 13:42:22 -08:00
send-pack.h
sequencer.c Merge branch 'mv/sequencer-pick-error-diag' 2013-05-09 13:30:19 -07:00
sequencer.h sequencer.c: teach append_signoff how to detect duplicate s-o-b 2013-02-12 11:17:10 -08:00
server-info.c
setup.c Merge branch 'jk/alias-in-bare' into maint 2013-04-03 09:25:41 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c sha1_file: trivial style cleanup 2013-06-03 10:14:48 -07:00
sha1_name.c strbuf_branchname(): do not double-expand @{-1}~22 2013-05-16 12:53:59 -07:00
shallow.c
shell.c shell: new no-interactive-login command to print a custom message 2013-03-09 23:21:35 -08:00
shortlog.h
show-index.c
sideband.c pkt-line: share buffer/descriptor reading implementation 2013-02-24 00:14:15 -08:00
sideband.h pkt-line: move LARGE_PACKET_MAX definition from sideband 2013-02-20 13:42:22 -08:00
sigchain.c
sigchain.h
strbuf.c strbuf: create strbuf_humanise_bytes() to show byte sizes 2013-04-10 12:58:33 -07:00
strbuf.h strbuf: create strbuf_humanise_bytes() to show byte sizes 2013-04-10 12:58:33 -07:00
streaming.c avoid infinite loop in read_istream_loose 2013-03-27 13:47:02 -07:00
streaming.h
string-list.c Merge branch 'mh/ceiling' into maint 2013-01-28 11:07:18 -08:00
string-list.h Merge branch 'mh/ceiling' into maint 2013-01-28 11:07:18 -08:00
submodule.c submodule: print graph output next to submodule log 2013-04-05 11:28:10 -07:00
submodule.h submodule: print graph output next to submodule log 2013-04-05 11:28:10 -07:00
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-ctype.c
test-date.c
test-delta.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-dump-cache-tree.c
test-genrandom.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-index-version.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-line-buffer.c
test-match-trees.c
test-mergesort.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-mktemp.c
test-parse-options.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-path-utils.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 sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-svn-fe.c msvc: test-svn-fe: Fix linker "unresolved external" error 2013-02-25 12:40:34 -08:00
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c Merge branch 'fc/transport-helper-error-reporting' 2013-05-29 14:20:16 -07:00
transport.c Merge branch 'jk/pkt-line-cleanup' 2013-04-01 08:59:37 -07:00
transport.h Sync with 'maint' 2013-04-12 13:54:01 -07:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c dir.c: replace is_path_excluded with now equivalent is_excluded API 2013-04-15 12:34:01 -07:00
unpack-trees.h dir.c: replace is_path_excluded with now equivalent is_excluded API 2013-04-15 12:34:01 -07:00
upload-pack.c upload-pack: ignore 'shallow' lines with unknown obj-ids 2013-04-28 22:33:53 -07:00
url.c
url.h
usage.c Merge branch 'jk/a-thread-only-dies-once' into maint 2013-04-26 11:25:59 -07:00
userdiff.c
userdiff.h
utf8.c pretty: Fix bug in truncation support for %>, %< and %>< 2013-04-28 12:09:37 -07:00
utf8.h pretty: support %>> that steal trailing spaces 2013-04-18 16:28:29 -07:00
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c config: allow inaccessible configuration under $HOME 2013-04-15 07:26:50 -07:00
write_or_die.c write_or_die: raise SIGPIPE when we get EPIPE 2013-02-20 13:42:21 -08:00
ws.c
wt-status.c dir.c: git-status --ignored: don't scan the work tree twice 2013-04-15 12:36:42 -07:00
wt-status.h status: show commit sha1 in "You are currently reverting" message 2013-04-02 14:22:56 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c zlib: fix compilation failures with Sun C Compilaer 2013-04-22 09:49:04 -07:00

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

	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.