A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Jay Soffian da3efdb17b receive-pack: detect aliased updates which can occur with symrefs
When pushing to a remote repo the sending side filters out aliased
updates (e.g., foo:baz bar:baz). However, it is not possible for the
sender to know if two refs are aliased on the receiving side via
symrefs. Here is one such scenario:

  $ git init origin
  $ (cd origin && touch file && git add file && git commit -a -m intial)
  $ git clone --bare origin origin.git
  $ rm -rf origin

  $ git clone origin.git client

  $ git clone --mirror client backup.git &&
  $ (cd backup.git && git remote set-head origin --auto)

  $ (cd client &&
	git remote add --mirror backup ../backup.git &&
	echo change1 > file && git commit -a -m change1 &&
	git push origin &&
	git push backup
	)

The push to backup fails with:

  Counting objects: 5, done.
  Writing objects: 100% (3/3), 244 bytes, done.
  Total 3 (delta 0), reused 0 (delta 0)
  Unpacking objects: 100% (3/3), done.
  error: Ref refs/remotes/origin/master is at ef3... but expected 262...
  remote: error: failed to lock refs/remotes/origin/master
  To ../backup.git
     262cd57..ef307ff  master -> master
     262cd57..ef307ff  origin/HEAD -> origin/HEAD
   ! [remote rejected] origin/master -> origin/master (failed to lock)
  error: failed to push some refs to '../backup.git'

The reason is that refs/remotes/origin/HEAD is a symref to
refs/remotes/origin/master, but it is not possible for the sending side
to unambiguously know this.

This commit fixes the issue by having receive-pack ignore any update to
a symref whose target is being identically updated. If a symref and its
target are being updated inconsistently, then the update for both fails
with an error message ("refusing inconsistent update...") to help
diagnose the situation.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-19 22:19:07 -07:00
Documentation Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 2010-04-13 12:27:19 -07:00
block-sha1
compat Don't redefine htonl and ntohl on big-endian 2010-03-31 14:21:39 -07:00
contrib Correct references to /usr/bin/python which does not exist on FreeBSD 2010-03-24 14:33:54 -07:00
git-gui Merge git://repo.or.cz/git-gui 2010-02-07 15:52:28 -08:00
git_remote_helpers Correct references to /usr/bin/python which does not exist on FreeBSD 2010-03-24 14:33:54 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2010-02-05 21:22:59 -08:00
gitweb gitweb: git_get_project_config requires only $git_dir, not also $project 2010-03-31 10:57:04 -07:00
perl Typofixes outside documentation area 2010-02-03 21:28:17 -08:00
ppc
t receive-pack: detect aliased updates which can occur with symrefs 2010-04-19 22:19:07 -07:00
templates
xdiff Merge branch 'jc/conflict-marker-size' 2010-01-20 20:28:51 -08:00
.gitattributes .gitattributes: detect 8-space indent in shell scripts 2010-01-06 12:22:25 -08:00
.gitignore Add test-run-command to .gitignore 2010-01-25 09:42:31 -08:00
.mailmap Merge branch 'mg/mailmap-update' into maint 2010-04-09 22:22:06 -07:00
COPYING Update COPYING with GPLv2 with new FSF address 2010-01-17 14:29:37 -08:00
GIT-VERSION-GEN Git 1.7.0.5 2010-04-11 13:42:33 -07:00
INSTALL INSTALL: document a simpler way to run uninstalled builds 2009-12-03 11:38:21 -08:00
Makefile Merge branch 'rb/maint-python-path' into maint 2010-04-09 22:22:19 -07:00
README
RelNotes Git 1.7.0.5 2010-04-11 13:42:33 -07:00
abspath.c
advice.c Reword "detached HEAD" notification 2010-01-29 22:11:00 -08:00
advice.h Reword "detached HEAD" notification 2010-01-29 22:11:00 -08:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c Merge branch 'jc/conflict-marker-size' 2010-01-20 20:28:51 -08:00
archive.h
attr.c git_attr(): fix function signature 2010-01-16 20:39:59 -08:00
attr.h git_attr(): fix function signature 2010-01-16 20:39:59 -08:00
base85.c Merge branch 'maint-1.6.2' into maint-1.6.3 2010-01-18 21:29:47 -08:00
bisect.c Merge branch 'cc/maint-bisect-paths' into maint-1.6.6 2010-03-07 14:53:35 -08:00
bisect.h builtin-rev-list.c: mark file-local function static 2010-01-11 23:16:16 -08:00
blob.c Replace parse_blob() with an explanatory comment 2010-01-18 17:04:02 -08:00
blob.h Replace parse_blob() with an explanatory comment 2010-01-18 17:04:02 -08:00
branch.c Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint 2010-04-11 13:39:47 -07:00
branch.h
builtin-add.c Merge branch 'cp/add-u-pathspec' into maint 2010-03-28 21:21:42 -07:00
builtin-annotate.c
builtin-apply.c Let check_preimage() use memset() to initialize "struct checkout" 2010-04-09 22:42:57 -07:00
builtin-archive.c Merge branch 'maint' 2010-02-07 15:52:12 -08:00
builtin-bisect--helper.c
builtin-blame.c blame: fix indent of line numbers 2010-03-13 12:04:17 -08:00
builtin-branch.c branch: say "Reset to" in reflog entries for 'git branch -f' operations 2010-04-09 20:40:54 -07:00
builtin-bundle.c
builtin-cat-file.c Typofixes outside documentation area 2010-02-03 21:28:17 -08:00
builtin-check-attr.c git_attr(): fix function signature 2010-01-16 20:39:59 -08:00
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-checkout.c Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint 2010-02-10 12:54:15 -08:00
builtin-clean.c git-clean: fix the description of the default behavior 2010-02-04 15:12:13 -08:00
builtin-clone.c Merge branch 'tc/clone-v-progress' 2010-01-17 15:58:58 -08:00
builtin-commit-tree.c commit-tree: remove unused #define 2010-01-25 09:53:12 -08:00
builtin-commit.c Merge branch 'jc/maint-status-preload' into maint 2010-03-04 22:25:45 -08:00
builtin-config.c Merge branch 'jh/maint-config-file-prefix' into maint 2010-02-10 13:02:05 -08:00
builtin-count-objects.c Merge branch 'maint-1.6.3' into maint-1.6.4 2010-01-18 21:37:06 -08:00
builtin-describe.c
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c
builtin-fast-export.c fast-export: don't segfault when marks file cannot be opened 2010-03-28 09:26:16 -07:00
builtin-fetch-pack.c run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
builtin-fetch.c fetch/push: fix usage strings 2010-04-09 21:23:10 -07:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c
builtin-fsck.c Update git fsck --full short description to mention packs 2010-02-05 13:01:45 -08:00
builtin-gc.c General --quiet improvements 2009-12-03 10:08:54 -08:00
builtin-grep.c Merge branch 'jc/grep-author-all-match-implicit' into maint 2010-03-08 00:35:59 -08:00
builtin-hash-object.c make "git hash-object" a built-in 2010-01-21 20:07:06 -08:00
builtin-help.c help: fix configured help format taking over command line one 2010-01-09 23:42:48 -08:00
builtin-index-pack.c make "index-pack" a built-in 2010-01-22 10:10:27 -08:00
builtin-init-db.c
builtin-log.c format-patch: Squelch 'fatal: Not a range." error 2010-03-29 21:22:37 -07:00
builtin-ls-files.c Merge branch 'jc/cache-unmerge' 2010-01-20 14:46:35 -08:00
builtin-ls-remote.c Merge branch 'sr/vcs-helper' 2009-12-26 14:03:16 -08:00
builtin-ls-tree.c
builtin-mailinfo.c mailinfo: do not strip leading spaces even for a header line 2010-02-19 21:55:33 -08:00
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c Merge branch 'jc/conflict-marker-size' 2010-01-20 20:28:51 -08:00
builtin-merge-index.c make "merge-index" a built-in 2010-01-22 10:01:21 -08:00
builtin-merge-ours.c
builtin-merge-recursive.c Make "subtree" part more orthogonal to the rest of merge-recursive. 2010-01-17 22:46:28 -08:00
builtin-merge-tree.c merge-tree: remove unnecessary call of git_extract_argv0_path 2010-01-22 10:01:06 -08:00
builtin-merge.c Merge branch 'ap/merge-backend-opts' 2010-01-20 20:28:50 -08:00
builtin-mktag.c make "mktag" a built-in 2010-01-22 10:01:33 -08:00
builtin-mktree.c
builtin-mv.c git-mv: fix moving more than one source to a single destination 2010-01-22 14:31:30 -08:00
builtin-name-rev.c
builtin-pack-objects.c Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. 2010-02-22 15:24:46 -08:00
builtin-pack-redundant.c make "git pack-redundant" a built-in 2010-01-22 10:07:14 -08:00
builtin-pack-refs.c
builtin-patch-id.c make "git patch-id" a built-in 2010-01-21 22:06:12 -08:00
builtin-prune-packed.c prune-packed: only show progress when stderr is a tty 2009-11-23 21:29:45 -08:00
builtin-prune.c prune: honor --expire=never 2010-02-28 10:28:05 -08:00
builtin-push.c fetch/push: fix usage strings 2010-04-09 21:23:10 -07:00
builtin-read-tree.c Merge branch 'jc/fix-tree-walk' 2010-01-24 17:35:58 -08:00
builtin-receive-pack.c receive-pack: detect aliased updates which can occur with symrefs 2010-04-19 22:19:07 -07:00
builtin-reflog.c reflog: honor gc.reflogexpire=never 2010-02-28 10:28:26 -08:00
builtin-remote.c Merge branch 'bg/maint-remote-update-default' into maint 2010-01-20 13:23:59 -08:00
builtin-replace.c
builtin-rerere.c Make 'rerere forget' work from a subdirectory. 2010-01-21 00:42:20 -08:00
builtin-reset.c Updated the usage string of git reset 2010-03-31 08:15:02 -07:00
builtin-rev-list.c rev-list: fix --pretty=oneline with empty message 2010-03-21 11:44:27 -07:00
builtin-rev-parse.c rev-parse: --local-env-vars option 2010-02-24 16:24:25 -08:00
builtin-revert.c cherry-pick: prettify the advice message 2010-02-11 22:11:12 -08:00
builtin-rm.c rm: only refresh entries that we may touch 2010-01-19 15:04:23 -08:00
builtin-send-pack.c Merge branch 'sp/maint-push-sideband' into maint 2010-03-02 22:54:50 -08:00
builtin-shortlog.c Merge branch 'rs/optim-text-wrap' into maint-1.6.6 2010-03-07 14:53:45 -08:00
builtin-show-branch.c Typofixes outside documentation area 2010-02-03 21:28:17 -08:00
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c tag -d: print sha1 of deleted tag 2009-12-10 18:45:34 -08:00
builtin-tar-tree.c
builtin-unpack-file.c make "git unpack-file" a built-in 2010-01-22 10:02:16 -08:00
builtin-unpack-objects.c
builtin-update-index.c Merge branch 'jc/cache-unmerge' 2010-01-20 14:46:35 -08:00
builtin-update-ref.c
builtin-update-server-info.c
builtin-upload-archive.c Merge branch 'np/maint-sideband-favor-status' into maint 2009-12-03 13:50:24 -08:00
builtin-var.c Make 'git var GIT_PAGER' always print the configured pager 2010-02-14 18:23:17 -08:00
builtin-verify-pack.c
builtin-verify-tag.c
builtin-write-tree.c
builtin.h make "index-pack" a built-in 2010-01-22 10:10:27 -08:00
bundle.c Merge branch 'jc/log-stdin' 2009-11-23 22:30:08 -08:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'gb/maint-submodule-env' into maint 2010-03-08 00:36:02 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c Merge branch 'jc/color-attrs' into maint 2010-03-24 16:24:13 -07:00
color.h Merge branch 'jc/color-attrs' into maint 2010-03-24 16:24:13 -07:00
combine-diff.c Give the hunk comment its own color 2009-11-28 10:05:44 -08:00
command-list.txt Add git-http-backend to command-list. 2009-12-26 14:12:34 -08:00
commit.c Merge branch 'maint-1.6.5' into maint 2010-01-29 23:36:13 -08:00
commit.h Merge branch 'jc/maint-limit-note-output' 2010-01-22 16:08:01 -08:00
config.c Merge branch 'jc/ident' 2010-01-20 14:39:52 -08:00
config.mak.in Make NO_PTHREADS the sole thread configuration variable 2010-01-31 11:50:50 -08:00
configure.ac Merge branch 'bw/no-python-autoconf' 2010-02-02 21:48:13 -08:00
connect.c Merge branch 'gb/maint-submodule-env' into maint 2010-03-08 00:36:02 -08:00
convert.c Merge branch 'sp/maint-push-sideband' into maint 2010-03-02 22:54:50 -08:00
copy.c
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'bc/maint-daemon-sans-ss-family' into maint 2010-04-09 22:22:00 -07:00
date.c Merge branch 'jc/maint-reflog-bad-timestamp' 2010-01-27 14:57:37 -08:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'jl/diff-submodule-ignore' 2010-01-26 22:53:13 -08:00
diff-no-index.c
diff.c Merge branch 'jc/conflict-marker-size' into maint 2010-04-09 22:38:34 -07:00
diff.h Merge branch 'jc/fix-tree-walk' 2010-01-24 17:35:58 -08:00
diffcore-break.c
diffcore-delta.c Fix diff -B/--dirstat miscounting of newly added contents 2009-12-05 10:54:17 -08:00
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diffcore-rename: reduce memory footprint by freeing blob data early 2009-11-20 22:13:47 -08:00
diffcore.h Performance optimization for detection of modified submodules 2010-01-18 17:28:21 -08:00
dir.c Merge branch 'jk/maint-add-ignored-dir' into maint 2010-03-24 16:24:03 -07:00
dir.h Merge branch 'nd/sparse' 2010-01-13 11:58:34 -08:00
editor.c editor: use run_command's shell feature 2010-01-05 23:41:51 -08:00
entry.c Merge branch 'jc/symbol-static' 2010-01-20 14:37:25 -08:00
environment.c Refactor list of of repo-local env vars 2010-02-24 16:24:25 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c fast-import: use the diff_delta() max_delta_size argument 2010-02-17 11:08:44 -08:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'jk/maint-add--interactive-delete' into maint 2010-03-08 00:36:00 -08:00
git-am.sh Merge branch 'jn/maint-fix-pager' into maint 2010-03-04 22:27:04 -08:00
git-archimport.perl
git-bisect.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-compat-util.h Merge branch 'il/maint-xmallocz' into maint 2010-02-10 13:02:16 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: standarize system() calls to external git tools 2010-01-19 12:22:19 -08:00
git-cvsserver.perl Merge branch 'gp/maint-cvsserver' 2010-01-28 00:46:33 -08:00
git-difftool--helper.sh Make difftool.prompt fall back to mergetool.prompt 2010-01-22 15:57:45 -08:00
git-difftool.perl difftool: Fix '--gui' when diff.guitool is unconfigured 2010-03-28 09:29:12 -07:00
git-filter-branch.sh Merge branch 'maint' 2010-02-11 23:06:32 -08:00
git-instaweb.sh fix portability issues with $ in double quotes 2010-01-26 15:16:54 -08:00
git-lost-found.sh
git-merge-octopus.sh octopus: remove dead code 2009-12-13 23:40:24 -08:00
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh add shebang line to git-mergetool--lib.sh 2010-01-29 09:56:51 -08:00
git-mergetool.sh
git-notes.sh
git-parse-remote.sh
git-pull.sh pull: replace unnecessary sed invocation 2010-03-20 07:25:02 -07:00
git-quiltimport.sh
git-rebase--interactive.sh work around an obnoxious bash "safety feature" on OpenBSD 2010-01-26 19:16:02 -08:00
git-rebase.sh rebase: don't invoke the pager for each commit summary 2010-01-30 08:42:42 -08:00
git-relink.perl
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'mg/maint-send-email-lazy-editor' into maint 2010-04-09 22:23:04 -07:00
git-sh-setup.sh Merge branch 'gb/maint-submodule-env' into maint 2010-03-08 00:36:02 -08:00
git-stash.sh Improve error messages from 'git stash show' 2010-03-16 19:23:24 -07:00
git-submodule.sh submodules: ensure clean environment when operating in a submodule 2010-02-24 16:24:25 -08:00
git-svn.perl git svn: Fix launching of pager 2010-02-14 18:23:17 -08:00
git-web--browse.sh
git.c Merge branch 'maint-1.6.6' into maint 2010-02-16 15:05:02 -08:00
git.spec.in RPM packaging: use %global inside %{!?...} 2010-01-31 11:33:44 -08:00
graph.c
graph.h
grep.c Merge branch 'jc/grep-author-all-match-implicit' into maint 2010-03-08 00:35:59 -08:00
grep.h Merge branch 'jc/grep-author-all-match-implicit' into maint 2010-03-08 00:35:59 -08:00
hash.c
hash.h
help.c Remove hyphen from "git-command" in two error messages 2010-02-15 18:20:54 -08:00
help.h
hex.c slim down "git show-index" 2010-01-21 20:03:45 -08:00
http-backend.c http-backend: Don't infinite loop during die() 2010-03-24 14:40:56 -07:00
http-fetch.c
http-push.c Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST 2009-11-22 22:56:54 -08:00
http-walker.c
http.c http.c: mark file-local functions static 2010-01-12 01:06:08 -08:00
http.h http.c: mark file-local functions static 2010-01-12 01:06:08 -08:00
ident.c ident.c: replace fprintf with fputs to suppress compiler warning 2010-01-19 15:25:38 -08:00
imap-send.c imap-send: Remove limitation on message body 2010-03-24 11:00:25 -07:00
levenshtein.c
levenshtein.h Typofixes outside documentation area 2010-02-03 21:28:17 -08:00
list-objects.c
list-objects.h
ll-merge.c Merge branch 'jc/conflict-marker-size' 2010-01-20 20:28:51 -08:00
ll-merge.h Merge branch 'jc/conflict-marker-size' 2010-01-20 20:28:51 -08:00
lockfile.c lockfile: show absolute filename in unable_to_lock_message 2010-01-12 15:48:24 -08:00
log-tree.c Fix "log" family not to be too agressive about showing notes 2010-01-20 19:57:02 -08:00
log-tree.h
mailmap.c mailmap.c: remove unused function 2010-01-12 01:06:09 -08:00
mailmap.h mailmap.c: remove unused function 2010-01-12 01:06:09 -08:00
match-trees.c Make "subtree" part more orthogonal to the rest of merge-recursive. 2010-01-17 22:46:28 -08:00
merge-file.c merge-tree: use ll_merge() not xdl_merge() 2010-01-16 23:45:33 -08:00
merge-recursive.c Merge branch 'maint' 2010-01-21 20:08:31 -08:00
merge-recursive.h Merge branch 'ap/merge-backend-opts' 2010-01-20 20:28:50 -08:00
name-hash.c
notes.c Fix crasher on encountering SHA1-like non-note in notes tree 2009-12-03 10:10:35 -08:00
notes.h
object.c object.c: remove unused functions 2010-01-17 22:49:36 -08:00
object.h object.c: remove unused functions 2010-01-17 22:49:36 -08:00
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c make "index-pack" a built-in 2010-01-22 10:10:27 -08:00
pack.h make "index-pack" a built-in 2010-01-22 10:10:27 -08:00
pager.c Make 'git var GIT_PAGER' always print the configured pager 2010-02-14 18:23:17 -08:00
parse-options.c Merge branch 'jc/symbol-static' 2010-01-20 14:37:25 -08:00
parse-options.h Merge branch 'jc/symbol-static' 2010-01-20 14:37:25 -08:00
patch-delta.c Fix integer overflow in patch_delta() 2010-01-26 12:57:59 -08:00
patch-ids.c
patch-ids.h
path.c Merge branch 'mm/mkstemps-mode-for-packfiles' into maint 2010-03-08 00:36:00 -08:00
pkt-line.c
pkt-line.h
preload-index.c Make ce_uptodate() trustworthy again 2010-01-24 00:15:29 -08:00
pretty.c Merge branch 'jc/maint-limit-note-output' 2010-01-22 16:08:01 -08:00
progress.c
progress.h
quote.c Fix invalid read in quote_c_style_counted 2010-02-06 10:55:03 -08:00
quote.h quote.c: mark file-local function static 2010-01-12 01:06:08 -08:00
reachable.c
reachable.h
read-cache.c Correct spelling of 'REUC' extension 2010-02-02 09:54:34 -08:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jc/maint-refs-dangling' into maint 2010-03-31 15:09:32 -07:00
refs.h rev-parse --branches/--tags/--remotes=pattern 2010-01-20 12:30:25 -08:00
remote-curl.c Merge branch 'sp/maint-push-sideband' into maint 2010-03-02 22:54:50 -08:00
remote.c refactor ref status logic for pushing 2010-01-09 23:34:10 -08:00
remote.h refactor ref status logic for pushing 2010-01-09 23:34:10 -08:00
replace_object.c
rerere.c rerere: fix memory leak if rerere images can't be read 2010-02-23 14:24:43 -08:00
rerere.h Merge branch 'jc/cache-unmerge' 2010-01-20 14:46:35 -08:00
resolve-undo.c build: make code "-Wpointer-arith" clean 2010-02-01 22:04:03 -08:00
resolve-undo.h build: make code "-Wpointer-arith" clean 2010-02-01 22:04:03 -08:00
revision.c don't use default revision if a rev was specified 2010-03-13 21:23:43 -08:00
revision.h Fix "log" family not to be too agressive about showing notes 2010-01-20 19:57:02 -08:00
run-command.c Merge branch 'mw/maint-gcc-warns-unused-write' into maint 2010-03-08 00:36:02 -08:00
run-command.h Merge branch 'sp/maint-push-sideband' into maint 2010-03-02 22:54:50 -08:00
send-pack.h
server-info.c
setup.c Typofixes outside documentation area 2010-02-03 21:28:17 -08:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'mm/mkstemps-mode-for-packfiles' into maint 2010-03-08 00:36:00 -08:00
sha1_name.c sha1_name: fix segfault caused by invalid index access 2010-02-28 10:32:06 -08:00
shallow.c
shell.c
shortlog.h
show-index.c slim down "git show-index" 2010-01-21 20:03:45 -08:00
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c Merge branch 'ap/merge-backend-opts' 2010-01-20 20:28:50 -08:00
strbuf.h Merge branch 'jc/maint-strbuf-add-fix-doubling' 2010-01-20 14:43:09 -08:00
string-list.c
string-list.h string-list: rename the include guard to STRING_LIST_H 2010-01-09 23:39:11 -08:00
submodule.c is_submodule_modified(): clear environment properly 2010-02-24 16:24:25 -08:00
submodule.h Teach diff --submodule that modified submodule directory is dirty 2010-01-24 21:04:31 -08:00
symlinks.c symlinks.c: remove unused functions 2010-01-17 22:49:36 -08:00
tag.c
tag.h
tar.h
test-chmtime.c Typofixes outside documentation area 2010-02-03 21:28:17 -08:00
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-match-trees.c
test-parse-options.c
test-path-utils.c
test-run-command.c start_command: detect execvp failures early 2010-01-10 10:15:03 -08:00
test-sha1.c
test-sha1.sh
test-sigchain.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c Typofixes outside documentation area 2010-02-03 21:28:17 -08:00
transport.c transport: add got_remote_refs flag 2010-02-16 09:11:22 -08:00
transport.h transport: add got_remote_refs flag 2010-02-16 09:11:22 -08:00
tree-diff.c Performance optimization for detection of modified submodules 2010-01-18 17:28:21 -08:00
tree-walk.c Merge branch 'maint-1.6.6' into maint 2010-02-14 18:59:14 -08:00
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c Merge branch 'jc/fix-tree-walk' 2010-01-24 17:35:58 -08:00
unpack-trees.h Merge branch 'jc/fix-tree-walk' 2010-01-24 17:35:58 -08:00
upload-pack.c run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
usage.c Fix truncated usage messages 2009-11-22 16:14:48 -08:00
userdiff.c git_attr(): fix function signature 2010-01-16 20:39:59 -08:00
userdiff.h
utf8.c Merge branch 'rs/optim-text-wrap' into maint 2010-03-04 22:26:33 -08:00
utf8.h Merge branch 'rs/optim-text-wrap' into maint 2010-03-04 22:26:33 -08:00
walker.c
walker.h
wrap-for-bin.sh build dashless "bin-wrappers" directory similar to installed bindir 2009-12-03 11:37:47 -08:00
wrapper.c Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. 2010-02-22 15:24:46 -08:00
write_or_die.c
ws.c git_attr(): fix function signature 2010-01-16 20:39:59 -08:00
wt-status.c Merge branch 'jl/submodule-diff' 2010-01-22 16:08:10 -08:00
wt-status.h status/commit: do not suggest "reset HEAD <path>" while merging 2009-12-12 01:22:10 -08:00
xdiff-interface.c
xdiff-interface.h

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. 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.