Junio C Hamano 46dc1b0e33 Merge branch 'maint' ... * maint: t1301-shared-repo.sh: don't let a default ACL interfere with the test git-check-attr(1): add output and example sections xdiff-interface.c: strip newline (and cr) from line before pattern matching t4018-diff-funcname: demonstrate end of line funcname matching flaw t4018-diff-funcname: rework negated last expression test Typo "does not exists" when git remote update remote. remote.c: correct the check for a leading '/' in a remote name Add testcase to ensure merging an early part of a branch is done properly Conflicts: t/t7600-merge.sh		2008-10-17 01:52:32 -07:00
..
howto	Documentation: remove stale howto/rebase-and-edit.txt	2008-10-12 11:31:55 -07:00
technical	run-command.c: remove run_command_v_opt_cd()	2008-10-02 18:02:44 -07:00
.gitattributes
.gitignore
asciidoc.conf
blame-options.txt
build-docdep.perl
callouts.xsl
cat-texi.perl
cmd-list.perl
CodingGuidelines
config.txt	cygwin: Use native Win32 API for stat	2008-09-30 14:30:06 -07:00
diff-format.txt
diff-generate-patch.txt
diff-options.txt	diff --dirstat-by-file: count changed files, not lines	2008-09-05 14:04:26 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt
fetch-options.txt
fix-texi.perl
git-add.txt
git-am.txt
git-annotate.txt	Mention the fact that 'git annotate' is only for backward compatibility.	2008-09-05 01:15:40 -07:00
git-apply.txt	git-apply:--include=pathspec	2008-09-06 18:56:44 -07:00
git-archimport.txt
git-archive.txt
git-bisect.txt
git-blame.txt
git-branch.txt
git-bundle.txt
git-cat-file.txt
git-check-attr.txt	git-check-attr(1): add output and example sections	2008-10-16 08:40:25 -07:00
git-check-ref-format.txt
git-checkout-index.txt
git-checkout.txt	Merge branch 'jc/better-conflict-resolution'	2008-09-29 10:15:07 -07:00
git-cherry-pick.txt
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt
git-commit-tree.txt	Fix passwd(5) ref and reflect that commit doens't use commit-tree	2008-09-03 14:51:19 -07:00
git-commit.txt	git commit --author=$name: look $name up in existing commits	2008-08-30 21:04:50 -07:00
git-config.txt
git-count-objects.txt
git-cvsexportcommit.txt
git-cvsimport.txt
git-cvsserver.txt
git-daemon.txt
git-describe.txt
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt
git-fast-export.txt
git-fast-import.txt
git-fetch-pack.txt
git-fetch.txt
git-filter-branch.txt
git-fmt-merge-msg.txt
git-for-each-ref.txt	for-each-ref: :short format for refname	2008-09-05 23:06:37 -07:00
git-format-patch.txt
git-fsck-objects.txt
git-fsck.txt
git-gc.txt
git-get-tar-commit-id.txt
git-grep.txt	git grep: Add "-z/--null" option as in GNU's grep.	2008-10-01 09:14:54 -07:00
git-gui.txt
git-hash-object.txt
git-help.txt	builtin-help: fallback to GIT_MAN_VIEWER before man	2008-08-29 21:46:33 -07:00
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt
git-index-pack.txt
git-init-db.txt
git-init.txt
git-instaweb.txt
git-log.txt	Improve git-log documentation wrt file filters	2008-10-01 08:21:22 -07:00
git-lost-found.txt
git-ls-files.txt
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
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	Merge branch 'jc/better-conflict-resolution'	2008-09-29 10:15:07 -07:00
git-mergetool.txt
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt	Fix example in git-name-rev documentation	2008-08-30 13:23:01 -07:00
git-pack-objects.txt
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt
git-peek-remote.txt
git-prune-packed.txt
git-prune.txt	make prune report removed objects on -v	2008-09-30 14:30:00 -07:00
git-pull.txt
git-push.txt	git-push.txt: Describe --repo option in more detail	2008-10-08 07:15:53 -07:00
git-quiltimport.txt
git-read-tree.txt	Correct typos in RelNotes-1.6.1	2008-09-30 11:51:16 -07:00
git-rebase.txt	Fixed some grammatical errors in git-rebase.txt documentation.	2008-09-24 09:12:07 -07:00
git-receive-pack.txt
git-reflog.txt
git-relink.txt
git-remote.txt
git-repack.txt	git-repack uses --no-repack-object, not --no-repack-delta.	2008-09-19 22:23:14 -07:00
git-repo-config.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt
git-rev-list.txt	Documentation: remove '\' in front of short options	2008-10-01 08:18:46 -07:00
git-rev-parse.txt
git-revert.txt
git-rm.txt
git-send-email.txt	send-email: signedoffcc -> signedoffbycc, but handle both	2008-10-01 08:56:58 -07:00
git-send-pack.txt
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-stash.txt	Documentation: minor cleanup in a use case in 'git stash' manual	2008-09-01 22:02:11 -07:00
git-status.txt
git-stripspace.txt
git-submodule.txt	git-submodule: add "sync" command	2008-08-25 22:48:01 -07:00
git-svn.txt	Add git-svn branch to allow branch creation in SVN repositories	2008-10-06 09:00:55 -07:00
git-symbolic-ref.txt
git-tag.txt
git-tar-tree.txt
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	Fix passwd(5) ref and reflect that commit doens't use commit-tree	2008-09-03 14:51:19 -07:00
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt	git-web--browse: Support for using /bin/start on MinGW	2008-09-24 15:49:21 -07:00
git-whatchanged.txt
git-write-tree.txt
git.txt	GIT 1.6.0.2	2008-09-12 16:18:47 -07:00
gitattributes.txt	Teach git diff about Objective-C syntax	2008-10-06 09:02:47 -07:00
gitcli.txt
gitcore-tutorial.txt
gitcvs-migration.txt
gitdiffcore.txt	Bust the ghost of long-defunct diffcore-pathspec.	2008-09-19 19:48:30 -07:00
gitglossary.txt
githooks.txt	docs: describe pre-rebase hook	2008-10-06 01:17:05 -07:00
gitignore.txt
gitk.txt	Document gitk --argscmd flag.	2008-08-29 00:14:29 -07:00
gitmodules.txt	Document clarification: gitmodules, gitattributes	2008-08-31 16:31:58 -07:00
gitrepository-layout.txt
gittutorial-2.txt
gittutorial.txt	tutorial: gentler illustration of Alice/Bob workflow using gitk	2008-08-29 00:14:30 -07:00
glossary-content.txt
howto-index.sh
i18n.txt	Fix passwd(5) ref and reflect that commit doens't use commit-tree	2008-09-03 14:51:19 -07:00
install-doc-quick.sh
install-webdoc.sh
Makefile	allow installation of man and html doc from the man and html branches	2008-09-10 15:40:13 -07:00
manpage-1.72.xsl
merge-config.txt	Fix some manual typos.	2008-09-12 13:19:56 -07:00
merge-options.txt
merge-strategies.txt
pretty-formats.txt	add '%d' pretty format specifier to show decoration	2008-09-04 17:01:41 -07:00
pretty-options.txt
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
RelNotes-1.5.2.4.txt
RelNotes-1.5.2.5.txt
RelNotes-1.5.2.txt
RelNotes-1.5.3.1.txt
RelNotes-1.5.3.2.txt
RelNotes-1.5.3.3.txt
RelNotes-1.5.3.4.txt
RelNotes-1.5.3.5.txt
RelNotes-1.5.3.6.txt
RelNotes-1.5.3.7.txt
RelNotes-1.5.3.8.txt
RelNotes-1.5.3.txt
RelNotes-1.5.4.1.txt
RelNotes-1.5.4.2.txt
RelNotes-1.5.4.3.txt
RelNotes-1.5.4.4.txt
RelNotes-1.5.4.5.txt
RelNotes-1.5.4.6.txt
RelNotes-1.5.4.txt
RelNotes-1.5.5.1.txt
RelNotes-1.5.5.2.txt
RelNotes-1.5.5.3.txt
RelNotes-1.5.5.4.txt
RelNotes-1.5.5.5.txt
RelNotes-1.5.5.txt
RelNotes-1.5.6.1.txt
RelNotes-1.5.6.2.txt
RelNotes-1.5.6.3.txt
RelNotes-1.5.6.4.txt
RelNotes-1.5.6.5.txt
RelNotes-1.5.6.txt
RelNotes-1.6.0.1.txt	GIT 1.6.0.1	2008-08-24 14:47:24 -07:00
RelNotes-1.6.0.2.txt	Update draft release notes for 1.6.0.2	2008-09-10 13:38:20 -07:00
RelNotes-1.6.0.3.txt	Update draft release notes to 1.6.0.3	2008-10-13 15:41:36 -07:00
RelNotes-1.6.0.txt
RelNotes-1.6.1.txt	Update draft release notes to 1.6.1	2008-10-13 17:05:45 -07:00
rev-list-options.txt	Merge branch 'tr/filter-branch'	2008-09-02 17:47:13 -07:00
SubmittingPatches
urls-remotes.txt
urls.txt
user-manual.conf
user-manual.txt