Shawn O. Pearce 2e13e5d892 Merge branch 'master' into db/fetch-pack ... There's a number of tricky conflicts between master and this topic right now due to the rewrite of builtin-push. Junio must have handled these via rerere; I'd rather not deal with them again so I'm pre-merging master into the topic. Besides this topic somehow started to depend on the strbuf series that was in next, but is now in master. It no longer compiles on its own without the strbuf API. * master: (184 commits) Whip post 1.5.3.4 maintenance series into shape. Minor usage update in setgitperms.perl manual: use 'URL' instead of 'url'. manual: add some markup. manual: Fix example finding commits referencing given content. Fix wording in push definition. Fix some typos, punctuation, missing words, minor markup. manual: Fix or remove em dashes. Add a --dry-run option to git-push. Add a --dry-run option to git-send-pack. Fix in-place editing functions in convert.c instaweb: support for Ruby's WEBrick server instaweb: allow for use of auto-generated scripts Add 'git-p4 commit' as an alias for 'git-p4 submit' hg-to-git speedup through selectable repack intervals git-svn: respect Subversion's [auth] section configuration values gtksourceview2 support for gitview fix contrib/hooks/post-receive-email hooks.recipients error message Support cvs via git-shell rebase -i: use diff plumbing instead of porcelain ... Conflicts: Makefile builtin-push.c rsh.c		2007-10-16 00:15:25 -04:00
..
howto	Fixed update-hook example allow-users format.	2007-09-18 17:38:52 -07:00
technical
.gitignore
asciidoc.conf	Merge branch 'maint'	2007-07-18 17:00:36 -07:00
blame-options.txt	Fix formatting of git-blame documentation.	2007-08-10 00:47:53 -07:00
build-docdep.perl
callouts.xsl	Revert "tweak manpage formatting"	2007-08-10 11:32:42 -07:00
cmd-list.perl	Move convert-objects to contrib.	2007-09-25 17:34:12 -07:00
config.txt	Merge branch 'master' into db/fetch-pack	2007-10-16 00:15:25 -04:00
core-tutorial.txt	core-tutorial: correct URL	2007-09-25 23:39:01 -07:00
cvs-migration.txt
diff-format.txt	diff: round down similarity index	2007-06-25 01:51:21 -07:00
diff-options.txt	fixed link in documentation of diff-options	2007-10-01 23:27:20 -07:00
diffcore.txt
docbook-xsl.css
docbook.xsl	Mark user-manual as UTF-8	2007-07-24 00:47:05 -07:00
everyday.txt
fetch-options.txt
fix-texi.perl	Add support for an info version of the user manual	2007-08-10 23:16:18 -07:00
git-add.txt	git-add: Make the filename globbing note a bit clearer	2007-08-28 21:16:57 -07:00
git-am.txt
git-annotate.txt
git-apply.txt	apply: get rid of --index-info in favor of --build-fake-ancestor	2007-09-26 13:42:10 -07:00
git-archimport.txt
git-archive.txt	git-archive: document --exec	2007-10-15 21:10:54 -04:00
git-bisect.txt
git-blame.txt
git-branch.txt	Note that git-branch will not automatically checkout the new branch	2007-10-02 17:27:00 -07:00
git-bundle.txt	git-bundle: fix commandline examples in the manpage	2007-09-29 15:40:17 -07:00
git-cat-file.txt
git-check-attr.txt
git-check-ref-format.txt
git-checkout-index.txt
git-checkout.txt	Say when --track is useful in the git-checkout docs.	2007-10-02 17:26:40 -07:00
git-cherry-pick.txt
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt	Documentation / grammer nit	2007-09-07 21:01:33 -07:00
git-commit-tree.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-commit.txt	Documentation/git-commit.txt: correct bad list formatting.	2007-08-06 23:25:10 -07:00
git-config.txt	Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot	2007-09-14 14:51:08 -07:00
git-count-objects.txt
git-cvsexportcommit.txt	Documentation: For consistency, use CVS instead of cvs.	2007-08-24 18:54:37 -07:00
git-cvsimport.txt
git-cvsserver.txt	Documentation: For consistency, use CVS instead of cvs.	2007-08-24 18:54:37 -07:00
git-daemon.txt	Documentation: minor AsciiDoc mark-up fixes.	2007-09-01 04:06:13 -07:00
git-describe.txt
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt	Fix some typos, punctuation, missing words, minor markup.	2007-10-15 22:11:02 -04:00
git-fast-import.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-fetch-pack.txt
git-fetch.txt	Add urls.txt to git-clone man page	2007-07-05 21:43:48 -07:00
git-filter-branch.txt	Remove duplicate note about removing commits with git-filter-branch	2007-09-13 22:53:53 -07:00
git-fmt-merge-msg.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-for-each-ref.txt	Make for-each-ref's grab_date() support per-atom formatting	2007-09-29 20:31:59 -07:00
git-format-patch.txt	format-patch documentation: reword to hint "--root <one-commit>" more clearly	2007-08-28 21:58:53 -07:00
git-fsck-objects.txt
git-fsck.txt	fsck --lost-found: write blob's contents, not their SHA-1	2007-07-22 15:59:27 -07:00
git-gc.txt	git-gc --auto: run "repack -A -d -l" as necessary.	2007-09-17 23:12:16 -07:00
git-get-tar-commit-id.txt
git-grep.txt
git-gui.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-hash-object.txt
git-http-fetch.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-http-push.txt
git-imap-send.txt
git-index-pack.txt	Fix some typos, punctuation, missing words, minor markup.	2007-10-15 22:11:02 -04:00
git-init-db.txt	Add an option to quiet git-init.	2007-06-27 22:22:17 -07:00
git-init.txt	Add an option to quiet git-init.	2007-06-27 22:22:17 -07:00
git-instaweb.txt	instaweb: support for Ruby's WEBrick server	2007-10-15 21:36:19 -04:00
git-local-fetch.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-log.txt	Porcelain level "log" family should recurse when diffing.	2007-08-28 00:10:21 -07:00
git-lost-found.txt	Documentation/git-lost-found.txt: drop unnecessarily duplicated name.	2007-09-21 12:53:08 -07:00
git-ls-files.txt	Document ls-files --with-tree=<tree-ish>	2007-09-17 23:57:35 -07:00
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt
git-mailsplit.txt
git-merge-base.txt
git-merge-file.txt
git-merge-index.txt	Fix some typos, punctuation, missing words, minor markup.	2007-10-15 22:11:02 -04:00
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	Merge branch 'lh/merge'	2007-10-03 03:05:58 -07:00
git-mergetool.txt
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-pack-objects.txt	Merge branch 'maint'	2007-09-23 17:13:55 -07:00
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt
git-peek-remote.txt
git-prune-packed.txt	Conjugate "search" correctly in the git-prune-packed man page.	2007-09-21 12:54:24 -07:00
git-prune.txt
git-pull.txt	Add urls.txt to git-clone man page	2007-07-05 21:43:48 -07:00
git-push.txt	Add a --dry-run option to git-push.	2007-10-15 22:02:52 -04:00
git-quiltimport.txt
git-read-tree.txt
git-rebase.txt	Merge branch 'maint'	2007-09-29 23:32:36 -07:00
git-receive-pack.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-reflog.txt	git-reflog: document --verbose	2007-10-15 21:10:54 -04:00
git-relink.txt
git-remote.txt	remote: document the 'rm' subcommand	2007-09-18 17:41:25 -07:00
git-repack.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-repo-config.txt
git-request-pull.txt
git-rerere.txt	Enable "git rerere" by the config variable rerere.enabled	2007-07-06 22:39:15 -07:00
git-reset.txt	Try to be consistent with capitalization in the documentation	2007-08-01 18:15:43 -07:00
git-rev-list.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
git-rev-parse.txt	Document what the stage numbers in the :$n:path syntax mean.	2007-08-19 22:56:10 -07:00
git-revert.txt
git-rm.txt	More permissive "git-rm --cached" behavior without -f.	2007-07-13 23:52:46 -07:00
git-runstatus.txt
git-send-email.txt	send-email --smtp-server-port: allow overriding the default port	2007-09-26 13:27:45 -07:00
git-send-pack.txt	Add a --dry-run option to git-send-pack.	2007-10-15 22:02:52 -04:00
git-sh-setup.txt
git-shell.txt
git-shortlog.txt
git-show-branch.txt
git-show-index.txt
git-show-ref.txt
git-show.txt
git-ssh-fetch.txt	Mark disused commit walkers officially deprecated.	2007-07-02 23:29:54 -07:00
git-ssh-upload.txt	Mark disused commit walkers officially deprecated.	2007-07-02 23:29:54 -07:00
git-stash.txt	Fix some typos, punctuation, missing words, minor markup.	2007-10-15 22:11:02 -04:00
git-status.txt	Add a note about the index being updated by git-status in some cases	2007-08-06 23:47:18 -07:00
git-stripspace.txt	Teach "git stripspace" the --strip-comments option	2007-07-26 22:51:44 -07:00
git-submodule.txt	git-submodule - allow a relative path as the subproject url	2007-09-25 00:31:12 -07:00
git-svn.txt	Fix some typos, punctuation, missing words, minor markup.	2007-10-15 22:11:02 -04:00
git-svnimport.txt	Document -u option in git-svnimport man page	2007-08-22 15:37:56 -07:00
git-symbolic-ref.txt
git-tag.txt	Fix some typos, punctuation, missing words, minor markup.	2007-10-15 22:11:02 -04:00
git-tar-tree.txt	Documentation: update tar.umask default	2007-08-22 15:19:41 -07:00
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt
git-update-ref.txt
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt
git-verify-pack.txt
git-verify-tag.txt	Make verify-tag a builtin.	2007-07-26 22:51:27 -07:00
git-whatchanged.txt
git-write-tree.txt
git.txt	Fix some typos, punctuation, missing words, minor markup.	2007-10-15 22:11:02 -04:00
gitattributes.txt	Sync with GIT 1.5.3.3	2007-09-29 16:31:40 -07:00
gitignore.txt	Fix spelling of overridden in documentation	2007-09-25 23:38:42 -07:00
gitk.txt
gitmodules.txt
glossary.txt	manual: add some markup.	2007-10-15 22:11:03 -04:00
hooks.txt	post-checkout hook, tests, and docs	2007-09-29 21:11:21 -07:00
howto-index.sh
i18n.txt
install-doc-quick.sh	Fix "make GZ=1 quick-install-doc"	2007-08-06 21:16:21 -07:00
install-webdoc.sh
Makefile	documentation: replace Discussion section by link to user-manual chapter	2007-09-15 22:17:24 -04:00
merge-options.txt	git-merge: add --ff and --no-ff options	2007-09-23 17:14:03 -07:00
merge-strategies.txt
pretty-formats.txt	Support output ISO 8601 format dates	2007-07-13 22:47:49 -07:00
pretty-options.txt	pretty-options.txt: tiny doc fix	2007-07-25 00:06:38 -07:00
pull-fetch-param.txt
RelNotes-1.5.0.1.txt
RelNotes-1.5.0.2.txt
RelNotes-1.5.0.3.txt
RelNotes-1.5.0.4.txt
RelNotes-1.5.0.5.txt
RelNotes-1.5.0.6.txt
RelNotes-1.5.0.7.txt
RelNotes-1.5.0.txt
RelNotes-1.5.1.1.txt
RelNotes-1.5.1.2.txt
RelNotes-1.5.1.3.txt
RelNotes-1.5.1.4.txt
RelNotes-1.5.1.5.txt
RelNotes-1.5.1.6.txt
RelNotes-1.5.1.txt
RelNotes-1.5.2.1.txt
RelNotes-1.5.2.2.txt
RelNotes-1.5.2.3.txt	GIT 1.5.2.3	2007-07-02 00:35:58 -07:00
RelNotes-1.5.2.4.txt	GIT 1.5.2.4	2007-07-12 12:01:47 -07:00
RelNotes-1.5.2.5.txt	GIT 1.5.2.5	2007-08-15 15:01:20 -07:00
RelNotes-1.5.2.txt
RelNotes-1.5.3.1.txt	GIT 1.5.3.1: obsolete git-p4 in RPM spec file.	2007-09-03 01:28:37 -07:00
RelNotes-1.5.3.2.txt	GIT 1.5.3.2	2007-09-19 03:11:28 -07:00
RelNotes-1.5.3.3.txt	Whip post 1.5.3.3 maintenance series into shape.	2007-10-01 02:07:47 -07:00
RelNotes-1.5.3.4.txt	GIT 1.5.3.4	2007-10-03 02:33:48 -07:00
RelNotes-1.5.3.5.txt	Whip post 1.5.3.4 maintenance series into shape.	2007-10-15 22:29:50 -04:00
RelNotes-1.5.3.txt	Typofix: 1.5.3 release notes	2007-09-02 15:03:26 -07:00
RelNotes-1.5.4.txt	Start RelNotes for 1.5.4	2007-09-24 01:12:16 -07:00
repository-layout.txt
SubmittingPatches	Update my contact address as the maintainer.	2007-09-01 04:09:51 -07:00
tutorial-2.txt
tutorial.txt	Documentation: Correct various misspellings and typos.	2007-08-24 18:54:37 -07:00
urls-remotes.txt	Add urls.txt to git-clone man page	2007-07-05 21:43:48 -07:00
urls.txt	URL: allow port specification in ssh:// URLs	2007-09-01 03:35:29 -07:00
user-manual.conf
user-manual.txt	manual: use 'URL' instead of 'url'.	2007-10-15 22:11:03 -04:00