Junio C Hamano 2958d9b5db Merge branch 'master' into lj/refs ... * master: (72 commits) runstatus: do not recurse into subdirectories if not needed grep: fix --fixed-strings combined with expression. grep: free expressions and patterns when done. Corrected copy-and-paste thinko in ignore executable bit test case. An illustration of rev-list --parents --pretty=raw Allow git-checkout when on a non-existant branch. gitweb: Decode long title for link tooltips git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1 Ignore executable bit when adding files if filemode=0. Remove empty ref directories that prevent creating a ref. Use const for interpolate arguments git-archive: update documentation Deprecate merge-recursive.py gitweb: fix over-eager application of esc_html(). Allow '(no author)' in git-svn's authors file. Allow 'svn fetch' on '(no date)' revisions in Subversion. git-repack: allow git-repack to run in subdirectory Remove upload-tar and make git-tar-tree a thin wrapper to git-archive git-tar-tree: Move code for git-archive --format=tar to archive-tar.c git-tar-tree: Remove duplicate git_config() call ...		2006-09-27 22:23:12 -07:00
..
howto	Add Documentation/howto/setup-git-server-over-http.txt	2006-08-10 15:07:11 -07:00
technical	Documentation/technical/racy-git.txt	2006-08-15 21:32:54 -07:00
.gitignore
asciidoc.conf	Documentation/urls.txt: Use substitution to escape square brackets	2006-07-14 16:36:00 -07:00
build-docdep.perl
callouts.xsl
config.txt	fetch: get the remote branches to merge from the branch properties	2006-09-24 00:13:49 -07:00
core-tutorial.txt	Documentation: Fix broken links	2006-09-13 23:39:33 -07:00
cvs-migration.txt	Documentation: Fix broken links	2006-09-13 23:39:33 -07:00
diff-format.txt
diff-options.txt	Add the --color-words option to the diff options family	2006-08-10 15:28:57 -07:00
diffcore.txt
everyday.txt
fetch-options.txt
git-add.txt
git-am.txt
git-annotate.txt
git-apply.txt	git-apply(1): document --unidiff-zero	2006-09-17 15:08:29 -07:00
git-applymbox.txt
git-applypatch.txt
git-archimport.txt
git-archive.txt	git-archive: update documentation	2006-09-25 21:17:43 -07:00
git-bisect.txt
git-blame.txt	git-blame(1): mention options in the synopsis and advertise pickaxe	2006-08-25 19:26:05 -07:00
git-branch.txt
git-cat-file.txt
git-check-ref-format.txt
git-checkout-index.txt
git-checkout.txt
git-cherry-pick.txt
git-cherry.txt
git-clean.txt
git-clone.txt
git-commit-tree.txt
git-commit.txt	Minor documentation fixup.	2006-07-01 17:09:01 -07:00
git-convert-objects.txt
git-count-objects.txt
git-cvsexportcommit.txt	cvsexportcommit - add -a (add author line) flag, cleanup warnings	2006-07-23 22:51:14 -07:00
git-cvsimport.txt	Documentation: convert uses of git-link macro to gitlink	2006-08-02 11:32:04 -07:00
git-cvsserver.txt
git-daemon.txt	Add virtualization support to git-daemon	2006-09-20 11:15:39 -07:00
git-describe.txt
git-diff-files.txt	Assorted typo fixes	2006-07-09 02:42:41 -07:00
git-diff-index.txt
git-diff-stages.txt
git-diff-tree.txt
git-diff.txt	change ent to tree in git-diff documentation	2006-07-09 03:26:49 -07:00
git-fetch-pack.txt
git-fetch.txt
git-fmt-merge-msg.txt
git-for-each-ref.txt	git-for-each-ref: improve the documentation on scripting modes	2006-09-21 12:38:38 -07:00
git-format-patch.txt	Add option to set initial In-Reply-To/References	2006-07-14 20:41:37 -07:00
git-fsck-objects.txt
git-get-tar-commit-id.txt
git-grep.txt	Document git-grep -[Hh]	2006-09-15 18:37:01 -07:00
git-hash-object.txt
git-http-fetch.txt	Teach git-http-fetch the --stdin switch	2006-07-27 19:33:48 -07:00
git-http-push.txt
git-imap-send.txt
git-index-pack.txt
git-init-db.txt	Document receive.denyNonFastforwards	2006-09-20 23:32:22 -07:00
git-instaweb.txt	Add git-instaweb, instantly browse the working repo with gitweb	2006-07-01 18:29:26 -07:00
git-local-fetch.txt	Teach git-local-fetch the --stdin switch	2006-07-27 19:33:48 -07:00
git-log.txt
git-lost-found.txt
git-ls-files.txt	Documentation about exclude/ignore files	2006-07-13 21:52:42 -07:00
git-ls-remote.txt	git-ls-remote(1): document --upload-pack	2006-08-25 19:25:58 -07:00
git-ls-tree.txt
git-mailinfo.txt
git-mailsplit.txt	Assorted typo fixes	2006-07-09 02:42:41 -07:00
git-merge-base.txt
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	Assorted typo fixes	2006-07-09 02:42:41 -07:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt	typofix (git-name-rev documentation)	2006-07-11 12:45:20 -07:00
git-p4import.txt	Assorted typo fixes	2006-07-09 02:42:41 -07:00
git-pack-objects.txt	pack-objects: document --revs, --unpacked and --all.	2006-09-12 22:59:15 -07:00
git-pack-redundant.txt	Assorted typo fixes	2006-07-09 02:42:41 -07:00
git-parse-remote.txt
git-patch-id.txt
git-peek-remote.txt
git-prune-packed.txt
git-prune.txt
git-pull.txt
git-push.txt	git-push: allow -f as an alias for --force	2006-08-02 11:30:42 -07:00
git-quiltimport.txt
git-read-tree.txt
git-rebase.txt	rebase: allow --skip to work with --merge	2006-06-25 00:38:34 -07:00
git-receive-pack.txt	Document receive.denyNonFastforwards	2006-09-20 23:32:22 -07:00
git-relink.txt
git-repack.txt	git-repack(1): document --window and --depth	2006-09-17 15:10:07 -07:00
git-repo-config.txt	Assorted typo fixes	2006-07-09 02:42:41 -07:00
git-request-pull.txt
git-rerere.txt
git-reset.txt
git-resolve.txt
git-rev-list.txt	revision traversal: --author, --committer, and --grep.	2006-09-20 11:14:39 -07:00
git-rev-parse.txt	rev-parse documentation: talk about range notation.	2006-07-06 22:37:51 -07:00
git-revert.txt
git-rm.txt
git-send-email.txt
git-send-pack.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt
git-show-branch.txt	show-branch: match documentation and usage	2006-07-06 19:29:00 -07:00
git-show-index.txt
git-show-ref.txt	Document git-show-ref [-s|--hash] option.	2006-09-20 08:35:24 -07:00
git-show.txt
git-ssh-fetch.txt
git-ssh-upload.txt
git-status.txt	Documentation: git-status takes the same options as git-commit	2006-08-08 21:55:05 -07:00
git-stripspace.txt
git-svn.txt	Allow 'svn fetch' on '(no date)' revisions in Subversion.	2006-09-24 20:19:22 -07:00
git-svnimport.txt
git-symbolic-ref.txt
git-tag.txt
git-tar-tree.txt	Remove upload-tar and make git-tar-tree a thin wrapper to git-archive	2006-09-24 19:55:08 -07:00
git-tools.txt	Assorted typo fixes	2006-07-09 02:42:41 -07:00
git-unpack-file.txt
git-unpack-objects.txt	unpack-objects -r: call it "recover".	2006-09-13 12:59:49 -07:00
git-update-index.txt	update-index -g	2006-08-23 21:24:47 -07:00
git-update-ref.txt	update-ref: -d flag and ref creation safety.	2006-09-27 02:01:42 -07:00
git-update-server-info.txt
git-upload-archive.txt	Add git-upload-archive	2006-09-09 11:57:37 -07:00
git-upload-pack.txt
git-var.txt
git-verify-pack.txt
git-verify-tag.txt
git-whatchanged.txt
git-write-tree.txt
git.txt	git-archive: update documentation	2006-09-25 21:17:43 -07:00
gitk.txt	gitk(1): mention --all	2006-09-20 09:00:14 -07:00
glossary.txt	change ent to tree in git-diff documentation	2006-07-09 03:26:49 -07:00
hooks.txt	Fix trivial typos and inconsistencies in hooks documentation	2006-09-20 08:36:12 -07:00
howto-index.sh
install-webdoc.sh
Makefile	Documentation: Fix howto/revert-branch-rebase.html generation	2006-09-01 12:41:34 -07:00
merge-options.txt	git-merge --squash	2006-06-24 01:11:19 -07:00
merge-strategies.txt
pull-fetch-param.txt
repository-layout.txt	Documentation about exclude/ignore files	2006-07-13 21:52:42 -07:00
sort_glossary.pl
SubmittingPatches	Assorted typo fixes	2006-07-09 02:42:41 -07:00
tutorial-2.txt	Documentation: Fix broken links	2006-09-13 23:39:33 -07:00
tutorial.txt
urls.txt	Documentation/urls.txt: Use substitution to escape square brackets	2006-07-14 16:36:00 -07:00