1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-22 19:06:10 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Junio C Hamano b05c2f9ed4 Merge branch 'js/gc-with-stale-symref' into maint
"git gc" used to barf when a symbolic ref has gone dangling
(e.g. the branch that used to be your upstream's default when you
cloned from it is now gone, and you did "fetch --prune").

* js/gc-with-stale-symref:
  pack-objects: do not get distracted by broken symrefs
  gc: demonstrate failure with stale remote HEAD
2015-10-20 15:22:42 -07:00
Documentation Merge branch 'jc/doc-gc-prune-now' into maint 2015-10-20 15:22:40 -07:00
block-sha1
builtin Merge branch 'nd/ls-remote-does-not-have-u-option' into maint 2015-10-16 14:32:52 -07:00
compat poll: honor the timeout on Win32 2015-09-14 12:53:48 -07:00
contrib Merge branch 'pt/pull-builtin' into maint 2015-10-16 14:32:32 -07:00
ewah Merge branch 'es/osx-header-pollutes-mask-macro' into maint 2015-07-15 11:41:24 -07:00
git-gui
gitk-git Merge git://ozlabs.org/~paulus/gitk 2015-09-14 11:50:21 -07:00
gitweb
mergetools mergetools: add winmerge as a builtin tool 2015-05-20 13:13:44 -07:00
perl send-email: reduce dependencies impact on parse_address_line 2015-07-07 14:38:20 -07:00
po l10n: ru.po: update Russian translation 2015-09-30 18:01:23 +03:00
ppc
t Merge branch 'js/gc-with-stale-symref' into maint 2015-10-20 15:22:42 -07:00
templates Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
vcs-svn
xdiff
.gitattributes
.gitignore Merge branch 'hv/submodule-config' 2015-08-31 15:38:52 -07:00
.mailmap mailmap: update my entry with new email address 2015-09-16 09:08:48 -07:00
COPYING
GIT-VERSION-GEN Git 2.6.2 2015-10-16 14:40:05 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jk/make-findstring-makeflags-fix' into maint 2015-10-16 14:32:38 -07:00
README
RelNotes Git 2.6.2 2015-10-16 14:40:05 -07:00
abspath.c
aclocal.m4
advice.c merge: grammofix in please-commit-before-merge message 2015-10-02 14:29:56 -07:00
advice.h pull: check if in unresolved merge state 2015-06-18 13:17:16 -07:00
alias.c config: silence warnings for command names with invalid keys 2015-08-24 08:52:23 -07:00
alloc.c
archive-tar.c
archive-zip.c Merge branch 'rs/archive-zip-many' into maint 2015-09-03 19:18:01 -07:00
archive.c Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
archive.h
argv-array.c argv-array: implement argv_array_pushv() 2015-06-15 12:40:49 -07:00
argv-array.h argv-array: implement argv_array_pushv() 2015-06-15 12:40:49 -07:00
attr.c memoize common git-path "constant" files 2015-08-10 15:37:14 -07:00
attr.h
base85.c
bisect.c Merge branch 'dt/refs-pseudo' 2015-08-25 14:57:08 -07:00
bisect.h bisect: simplify the addition of new bisect terms 2015-08-03 11:42:41 -07:00
blob.c
blob.h
branch.c Merge branch 'dt/notes-multiple' 2015-08-25 14:57:08 -07:00
branch.h worktrees: add find_shared_symref 2015-08-11 13:48:15 -07:00
builtin.h builtin-am: implement skeletal builtin am 2015-08-04 22:02:11 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c create_bundle(): duplicate file descriptor to avoid closing it twice 2015-08-10 12:57:14 -07:00
bundle.h
cache-tree.c cache-tree: introduce write_index_as_tree() 2015-08-04 22:02:11 -07:00
cache-tree.h cache-tree: introduce write_index_as_tree() 2015-08-04 22:02:11 -07:00
cache.h Merge branch 'jk/fix-alias-pager-config-key-warnings' into maint 2015-09-03 19:17:52 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Sync with 2.4.10 2015-09-28 15:33:56 -07:00
command-list.txt Merge branch 'nd/multiple-work-trees' 2015-07-13 14:02:02 -07:00
commit-slab.h Merge branch 'jc/commit-slab' 2015-08-03 11:01:21 -07:00
commit.c Merge branch 'jc/commit-slab' 2015-08-03 11:01:21 -07:00
commit.h Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
config.c Merge branch 'ss/fix-config-fd-leak' into maint 2015-09-03 19:17:59 -07:00
config.mak.in
config.mak.uname config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases 2015-06-03 09:38:04 -07:00
configure.ac configure: add getdelim() check 2015-06-03 09:38:19 -07:00
connect.c Merge branch 'tk/typofix-connect-unknown-proto-error' into maint 2015-10-16 14:32:55 -07:00
connect.h
connected.c
connected.h
convert.c filter_buffer_or_fd(): ignore EPIPE 2015-05-20 10:19:12 -07:00
convert.h
copy.c copy.c: make copy_fd() report its status silently 2015-05-19 14:48:54 -07:00
credential-cache--daemon.c credential-cache--daemon: use tempfile module 2015-08-12 14:50:11 -07:00
credential-cache.c
credential-store.c lockfile: add accessors get_lock_file_fd() and get_lock_file_fp() 2015-08-10 12:57:14 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c write_file(): drop caller-supplied LF from calls to create a one-liner file 2015-08-25 12:49:19 -07:00
date.c introduce "format" date-mode 2015-06-29 11:39:10 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'nd/diff-i-t-a' 2015-06-25 10:47:46 -07:00
diff-no-index.c
diff.c Sync with v2.5.4 2015-09-28 19:16:54 -07:00
diff.h log: add "log.follow" configuration variable 2015-07-09 10:24:23 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c react to errors in xdi_diff 2015-09-28 14:57:10 -07:00
diffcore-rename.c
diffcore.h
dir.c Merge branch 'js/icase-wt-detection' into maint 2015-10-16 14:32:46 -07:00
dir.h Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
editor.c
entry.c
environment.c Merge branch 'nd/export-worktree' into maint 2015-08-19 14:41:30 -07:00
exec_cmd.c Merge branch 'jk/git-no-more-argv0-path-munging' into maint 2015-05-26 13:49:18 -07:00
exec_cmd.h
fast-import.c Merge branch 'jk/git-path' 2015-08-19 14:48:56 -07:00
fetch-pack.c memoize common git-path "constant" files 2015-08-10 15:37:14 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c Merge branch 'js/fsck-opt' 2015-08-03 11:01:18 -07:00
fsck.h fsck: git receive-pack: support excluding objects from fsck'ing 2015-06-23 14:27:37 -07:00
generate-cmdlist.sh generate-cmdlist: re-implement as shell script 2015-08-25 11:24:31 -07:00
gettext.c introduce "format" date-mode 2015-06-29 11:39:10 -07:00
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh bisect: don't mix option parsing and non-trivial code 2015-08-03 11:42:42 -07:00
git-compat-util.h Merge branch 'jk/long-error-messages' 2015-08-25 14:57:06 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl Merge branch 'cn/cvsimport-perl-update' 2015-06-25 11:08:08 -07:00
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: remove multi-line headers in msg filter 2015-10-12 11:23:19 -07:00
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool-lib: fix default tool selection 2015-06-19 11:20:52 -07:00
git-mergetool.sh mergetool--lib: set IFS for difftool and mergetool 2015-05-20 13:13:42 -07:00
git-p4.py git-p4: honor core.ignorecase when using P4 client specs 2015-08-28 10:33:16 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh rebase: return non-zero error code if format-patch fails 2015-07-08 15:36:42 -07:00
git-rebase--interactive.sh Merge branch 'gr/rebase-i-drop-warn' into maint 2015-10-16 14:32:43 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'jk/rebase-quiet-noop' into maint 2015-05-26 13:49:23 -07:00
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'bn/send-email-smtp-auth-error-message-fix' 2015-09-21 12:27:15 -07:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
git-stash.sh git-stash: use update-ref --create-reflog instead of creating files 2015-07-21 14:08:49 -07:00
git-submodule.sh Sync with 2.4.10 2015-09-28 15:33:56 -07:00
git-svn.perl git-svn: parse authors file more leniently 2015-09-10 17:59:38 +00:00
git-web--browse.sh
git.c builtin-am: remove redirection to git-am.sh 2015-08-04 22:02:11 -07:00
git.rc
git.spec.in
gpg-interface.c verify-commit: add option to print raw gpg status information 2015-06-22 14:20:47 -07:00
gpg-interface.h verify-commit: add option to print raw gpg status information 2015-06-22 14:20:47 -07:00
graph.c
graph.h
grep.c
grep.h
hashmap.c
hashmap.h
help.c Merge branch 'js/sleep-without-select' 2015-06-24 12:21:47 -07:00
help.h
hex.c
http-backend.c prefer git_pathdup to git_path in some possibly-dangerous cases 2015-08-10 15:37:12 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c Sync with v2.5.4 2015-09-28 19:16:54 -07:00
http.h
ident.c
imap-send.c
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c Sync with 2.3.10 2015-09-28 15:28:31 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint 2015-06-25 11:02:10 -07:00
list-objects.h
ll-merge.c Sync with 2.4.10 2015-09-28 15:33:56 -07:00
ll-merge.h
lockfile.c lockfile: remove function "hold_lock_file_for_append" 2015-08-28 11:32:01 -07:00
lockfile.h lockfile: remove function "hold_lock_file_for_append" 2015-08-28 11:32:01 -07:00
log-tree.c Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
log-tree.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c use file_exists() to check if a file exists in the worktree 2015-05-20 13:49:10 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c prefer git_pathdup to git_path in some possibly-dangerous cases 2015-08-10 15:37:12 -07:00
notes-merge.h notes: extract enum notes_merge_strategy to notes-utils.h 2015-08-17 15:36:23 -07:00
notes-utils.c notes: extract parse_notes_merge_strategy to notes-utils 2015-08-17 15:38:32 -07:00
notes-utils.h notes: extract parse_notes_merge_strategy to notes-utils 2015-08-17 15:38:32 -07:00
notes.c Sync with 2.4.9 2015-09-04 10:43:23 -07:00
notes.h
object.c Merge branch 'jk/type-from-string-gently' into maint 2015-05-13 14:05:54 -07:00
object.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'es/osx-header-pollutes-mask-macro' into maint 2015-07-15 11:41:24 -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 Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maint 2015-10-16 14:32:41 -07:00
parse-options-cb.c parse-options-cb: implement parse_opt_passthru_argv() 2015-06-15 12:40:49 -07:00
parse-options.c parse-options: move unsigned long option parsing out of pack-objects.c 2015-06-22 15:07:21 -07:00
parse-options.h Merge branch 'sb/parse-options-codeformat' 2015-08-12 14:09:57 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c test-path-utils.c: remove incorrect assumption 2015-10-08 18:03:50 -07:00
pathspec.c
pathspec.h
pkt-line.c pkt-line: support tracing verbatim pack contents 2015-06-16 13:24:22 -07:00
pkt-line.h
preload-index.c
pretty.c convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
prio-queue.c
prio-queue.h
progress.c progress: treat "no terminal" as being in the foreground 2015-05-19 09:35:14 -07:00
progress.h
prompt.c
prompt.h
quote.c quote: move comment before sq_quote_buf() 2015-10-07 15:12:01 -07:00
quote.h
reachable.c Merge branch 'js/gc-with-stale-symref' into maint 2015-10-20 15:22:42 -07:00
reachable.h
read-cache.c read-cache: fix indentation in read_index_from 2015-08-31 12:31:00 -07:00
ref-filter.c Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
ref-filter.h ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname 2015-08-03 10:24:07 -07:00
reflog-walk.c convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
reflog-walk.h convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
refs.c Merge branch 'mh/tempfile' 2015-08-25 14:57:09 -07:00
refs.h Merge branch 'dt/refs-pseudo' 2015-08-25 14:57:08 -07:00
remote-curl.c push: support signing pushes iff the server supports it 2015-08-19 12:58:45 -07:00
remote-testsvn.c refs: move the remaining ref module declarations to refs.h 2015-06-22 13:17:12 -07:00
remote.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
remote.h remote.c: add branch_get_push 2015-05-22 09:33:08 -07:00
replace_object.c register_replace_ref(): rewrite to take an object_id argument 2015-05-25 12:19:35 -07:00
rerere.c rerere: release lockfile in non-writing functions 2015-09-01 15:52:54 -07:00
rerere.h rerere: release lockfile in non-writing functions 2015-09-01 15:52:54 -07:00
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jk/log-missing-default-HEAD' into maint 2015-09-03 19:18:04 -07:00
revision.h convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
run-command.c Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maint 2015-10-16 14:32:41 -07:00
run-command.h Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maint 2015-10-16 14:32:41 -07:00
send-pack.c Merge branch 'db/push-sign-if-asked' 2015-08-31 15:39:08 -07:00
send-pack.h push: support signing pushes iff the server supports it 2015-08-19 12:58:45 -07:00
sequencer.c Merge branch 'dt/refs-pseudo' 2015-08-25 14:57:08 -07:00
sequencer.h
server-info.c add_info_ref(): rewrite to take an object_id argument 2015-05-25 12:19:35 -07:00
setup.c Merge branch 'nd/fixup-linked-gitdir' 2015-09-01 16:31:07 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Sync with 2.5.2 2015-09-09 14:30:35 -07:00
sha1_name.c convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
shallow.c Merge branch 'mh/tempfile' 2015-08-25 14:57:09 -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 'jh/strbuf-read-use-read-in-full' into maint 2015-09-03 19:17:50 -07:00
strbuf.h Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
streaming.c
streaming.h
string-list.c
string-list.h
submodule-config.c submodule: allow erroneous values for the fetchRecurseSubmodules option 2015-08-19 11:43:10 -07:00
submodule-config.h submodule: allow erroneous values for the fetchRecurseSubmodules option 2015-08-19 11:43:10 -07:00
submodule.c Merge branch 'jc/am-state-fix' 2015-08-31 15:39:03 -07:00
submodule.h submodule: allow erroneous values for the fetchRecurseSubmodules option 2015-08-19 11:43:10 -07:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c register_tempfile(): new function to handle an existing temporary file 2015-08-10 12:57:14 -07:00
tempfile.h register_tempfile(): new function to handle an existing temporary file 2015-08-10 12:57:14 -07:00
test-chmtime.c
test-config.c
test-ctype.c
test-date.c convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
test-delta.c
test-dump-cache-tree.c
test-dump-split-index.c commit: don't rewrite shared index unnecessarily 2015-08-31 08:41:07 -07:00
test-dump-untracked-cache.c
test-genrandom.c
test-hashmap.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c parse-options: move unsigned long option parsing out of pack-objects.c 2015-06-22 15:07:21 -07:00
test-path-utils.c test-path-utils.c: remove incorrect assumption 2015-10-08 18:03:50 -07:00
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
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-submodule-config.c submodule: use new config API for worktree configurations 2015-08-19 11:43:10 -07:00
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c pkt-line: support tracing verbatim pack contents 2015-06-16 13:24:22 -07:00
trace.h pkt-line: support tracing verbatim pack contents 2015-06-16 13:24:22 -07:00
trailer.c Merge branch 'cc/trailers-corner-case-fix' into maint 2015-09-03 19:18:03 -07:00
trailer.h
transport-helper.c Sync with v2.5.4 2015-09-28 19:16:54 -07:00
transport.c Sync with v2.5.4 2015-09-28 19:16:54 -07:00
transport.h Sync with v2.5.4 2015-09-28 19:16:54 -07:00
tree-diff.c
tree-walk.c tree-walk: learn get_tree_entry_follow_symlinks 2015-05-20 13:45:49 -07:00
tree-walk.h tree-walk: learn get_tree_entry_follow_symlinks 2015-05-20 13:45:49 -07:00
tree.c Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint 2015-06-25 11:02:10 -07:00
tree.h Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint 2015-06-25 11:02:10 -07:00
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Sync with 2.5.2 2015-09-09 14:30:35 -07:00
unpack-trees.h
update_unicode.sh
upload-pack.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c vreportf: avoid intermediate buffer 2015-08-11 14:29:36 -07:00
userdiff.c userdiff: add support for Fountain documents 2015-07-23 14:44:51 -07:00
userdiff.h
utf8.c
utf8.h Merge branch 'es/utf8-stupid-compiler-workaround' into maint 2015-07-15 11:41:23 -07:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c mark_complete(): rewrite to take an object_id argument 2015-05-25 12:19:37 -07:00
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c write_file_v(): do not leave incomplete line at the end 2015-08-25 12:48:39 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'mm/detach-at-HEAD-reflog' into maint 2015-10-16 14:32:44 -07:00
wt-status.h wt-status: move #include "pathspec.h" to the header 2015-08-21 14:49:27 -07:00
xdiff-interface.c xdiff: reject files larger than ~1GB 2015-09-28 14:57:23 -07:00
xdiff-interface.h xdiff: reject files larger than ~1GB 2015-09-28 14:57:23 -07:00
zlib.c

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

	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.