Junio C Hamano c2ff10c98e Merge branch 'jk/1.7.0-status' ... * jk/1.7.0-status: status/commit: do not suggest "reset HEAD <path>" while merging commit/status: "git add <path>" is not necessarily how to resolve commit/status: check $GIT_DIR/MERGE_HEAD only once t7508-status: test all modes with color t7508-status: status --porcelain ignores relative paths setting status: reduce duplicated setup code status: disable color for porcelain format status -s: obey color.status builtin-commit: refactor short-status code into wt-status.c t7508-status.sh: Add tests for status -s status -s: respect the status.relativePaths option docs: note that status configuration affects only long format commit: support alternate status formats status: add --porcelain output format status: refactor format option parsing status: refactor short-mode printing to its own function status: typo fix in usage git status: not "commit --dry-run" anymore git stat -s: short status output git stat: the beginning of "status that is not a dry-run of commit" Conflicts: t/t4034-diff-words.sh wt-status.c		2009-12-27 23:01:32 -08:00
..
howto	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
pt_BR	Documentation: update pt-BR	2009-10-01 08:21:35 -04:00
technical	Merge branch 'maint'	2009-12-19 23:20:16 -08:00
.gitattributes
.gitignore	Documentation: Avoid use of xmlto --stringparam	2009-12-05 10:03:49 -08:00
asciidoc.conf	git-submodule documentation: fix foreach example	2009-06-30 11:17:54 -07:00
blame-options.txt
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines
config.txt	Merge branch 'sr/vcs-helper'	2009-12-26 14:03:16 -08:00
diff-format.txt	Update the documentation of the raw diff output format	2009-07-28 13:32:59 -07:00
diff-generate-patch.txt
diff-options.txt	Fix over-simplified documentation for 'git log -z'	2009-11-23 01:21:51 -08:00
docbook-xsl.css	docbook: change css style	2009-04-06 00:27:09 -07:00
docbook.xsl
everyday.txt
fetch-options.txt	builtin-fetch: add --dry-run option	2009-11-10 01:02:12 -08:00
fix-texi.perl
git-add.txt	git-add.txt: fix formatting of --patch section	2009-11-14 00:26:37 -08:00
git-am.txt	add documentation for mailinfo.scissors and '--no-scissors'	2009-09-11 00:23:07 -07:00
git-annotate.txt
git-apply.txt	apply: Use the term "working tree" consistently	2009-11-22 12:08:08 -08:00
git-archimport.txt
git-archive.txt	archive: clarify description of path parameter	2009-12-04 15:16:40 -08:00
git-bisect-lk2009.txt	Documentation: add "Fighting regressions with git bisect" article	2009-11-08 18:29:08 -08:00
git-bisect.txt	Documentation: add "Fighting regressions with git bisect" article	2009-11-08 18:29:08 -08:00
git-blame.txt
git-branch.txt	Documentation: clarify branch creation	2009-10-09 14:54:15 -07:00
git-bundle.txt	Documentation: Fix a few i.e./e.g. mix-ups	2009-12-01 12:09:46 -08:00
git-cat-file.txt	fix cat-file usage message and documentation	2009-05-25 12:08:15 -07:00
git-check-attr.txt
git-check-ref-format.txt	Merge branch 'jn/show-normalized-refs'	2009-10-30 20:07:33 -07:00
git-checkout-index.txt
git-checkout.txt	Merge branch 'tr/reset-checkout-patch'	2009-09-07 15:24:38 -07:00
git-cherry-pick.txt
git-cherry.txt
git-citool.txt
git-clean.txt	UI consistency: allow --force for where -f means force	2009-08-29 14:08:03 -07:00
git-clone.txt	Documentation: Document --branch option in git clone synopsis	2009-11-30 08:47:54 -08:00
git-commit-tree.txt
git-commit.txt	Merge branch 'jk/1.7.0-status'	2009-12-27 23:01:32 -08:00
git-config.txt	git config: clarify --add and --get-color	2009-05-09 00:19:25 -07:00
git-count-objects.txt
git-cvsexportcommit.txt	Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch	2009-06-18 10:19:50 -07:00
git-cvsimport.txt	Documentation: fix typos / spelling mistakes	2009-04-20 15:56:07 -07:00
git-cvsserver.txt	cvsserver doc: database generally can not be reproduced consistently	2009-11-22 22:56:32 -08:00
git-daemon.txt	Merge branch 'maint-1.6.0' into maint-1.6.1	2009-04-18 14:43:24 -07:00
git-describe.txt	git-describe.txt: formatting fix	2009-11-10 14:06:41 -08:00
git-diff-files.txt	Update the documentation of the raw diff output format	2009-07-28 13:32:59 -07:00
git-diff-index.txt	Update the documentation of the raw diff output format	2009-07-28 13:32:59 -07:00
git-diff-tree.txt	Update the documentation of the raw diff output format	2009-07-28 13:32:59 -07:00
git-diff.txt	Update the documentation of the raw diff output format	2009-07-28 13:32:59 -07:00
git-difftool.txt	mergetool--lib: add p4merge as a pre-configured mergetool option	2009-10-28 16:48:20 -07:00
git-fast-export.txt	git fast-export: add --no-data option	2009-07-31 07:48:09 -07:00
git-fast-import.txt	fast-import: Add support for importing commit notes	2009-10-19 19:00:24 -07:00
git-fetch-pack.txt
git-fetch.txt	Merge branch 'bg/fetch-multi'	2009-11-23 00:03:15 -08:00
git-filter-branch.txt	filter-branch: nearest-ancestor rewriting outside subdir filter	2009-11-13 11:26:43 -08:00
git-fmt-merge-msg.txt	Documentation: git fmt-merge-msg does not have to be a script	2009-10-09 14:40:25 -07:00
git-for-each-ref.txt	for-each-ref: utilize core.warnAmbiguousRefs for :short-format	2009-04-13 09:36:52 -07:00
git-format-patch.txt	format-patch documentation: Fix formatting	2009-11-10 11:38:21 -08:00
git-fsck-objects.txt
git-fsck.txt	fsck: default to "git fsck --full"	2009-10-20 12:11:39 -07:00
git-gc.txt	Documentation/git-gc.txt: change "references" to "reference"	2009-10-20 00:01:23 -07:00
git-get-tar-commit-id.txt
git-grep.txt	grep: Add --max-depth option.	2009-07-22 21:54:54 -07:00
git-gui.txt
git-hash-object.txt
git-help.txt
git-http-backend.txt	http-backend: Use http.getanyfile to disable dumb HTTP serving	2009-11-04 17:58:16 -08:00
git-http-fetch.txt
git-http-push.txt	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
git-imap-send.txt	Merge branch 'maint'	2009-04-18 14:45:59 -07:00
git-index-pack.txt
git-init-db.txt	init-db: migrate to parse-options	2009-07-12 14:36:40 -07:00
git-init.txt	git init: optionally allow a directory argument	2009-07-25 02:17:54 -07:00
git-instaweb.txt	Add support for the Mongoose web server.	2009-08-23 15:03:53 -07:00
git-log.txt	git-log: allow --decorate[=short|full]	2009-08-26 12:05:58 -07:00
git-lost-found.txt
git-ls-files.txt	Merge branch 'jk/maint-1.6.3-ls-files-i' into maint	2009-11-15 23:07:32 -08:00
git-ls-remote.txt
git-ls-tree.txt	Merge branch 'maint-1.6.1' into maint-1.6.2	2009-05-13 21:06:11 -07:00
git-mailinfo.txt	Merge branch 'jc/mailinfo-remove-brackets'	2009-11-30 14:43:24 -08:00
git-mailsplit.txt
git-merge-base.txt	git-merge-base/git-show-branch --merge-base: Documentation and test	2009-08-05 10:29:37 -07:00
git-merge-file.txt
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	modernize fetch/merge/pull examples	2009-10-21 14:20:50 -07:00
git-mergetool--lib.txt	mergetool--lib: simplify API usage by removing more global variables	2009-04-12 15:19:12 -07:00
git-mergetool.txt	mergetool--lib: add p4merge as a pre-configured mergetool option	2009-10-28 16:48:20 -07:00
git-mktag.txt
git-mktree.txt	mktree --batch: build more than one tree object	2009-05-16 10:28:59 -07:00
git-mv.txt	UI consistency: allow --force for where -f means force	2009-08-29 14:08:03 -07:00
git-name-rev.txt
git-notes.txt	Teach "-m <msg>" and "-F <file>" to "git notes edit"	2009-10-19 18:59:43 -07:00
git-pack-objects.txt	pack-objects: split implications of --all-progress from progress activation	2009-11-23 21:33:09 -08:00
git-pack-redundant.txt
git-pack-refs.txt	doc/git-pack-refs: fix two grammar issues	2009-04-05 00:39:37 -07:00
git-parse-remote.txt	parse-remote: remove unused functions	2009-06-11 19:50:45 -07:00
git-patch-id.txt
git-peek-remote.txt
git-prune-packed.txt	prune-packed: migrate to parse-options	2009-07-10 23:57:21 -07:00
git-prune.txt
git-pull.txt	Merge branch 'ja/fetch-doc' into maint	2009-11-15 16:38:18 -08:00
git-push.txt	Merge branch 'fc/doc-fast-forward'	2009-11-15 16:41:02 -08:00
git-quiltimport.txt	quiltimport documentation: --dry-run and -n are synonyms	2009-09-13 01:32:49 -07:00
git-read-tree.txt	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
git-rebase.txt	Merge branch 'tr/maint-merge-ours-clarification' (early part)	2009-11-22 16:28:06 -08:00
git-receive-pack.txt	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
git-reflog.txt
git-relink.txt
git-remote-helpers.txt	Merge branch 'sr/vcs-helper'	2009-12-26 14:03:16 -08:00
git-remote.txt	git remote: Separate usage strings for subcommands	2009-11-20 22:15:30 -08:00
git-repack.txt	git-repack.txt: Clarify implications of -a for dumb protocols	2009-06-09 23:47:49 -07:00
git-replace.txt	Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS	2009-11-20 22:08:11 -08:00
git-repo-config.txt
git-request-pull.txt
git-rerere.txt	git-rerere.txt: Clarify ambiguity of the config variable	2009-07-28 13:30:42 -07:00
git-reset.txt	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
git-rev-list.txt	Merge branch 'maint'	2009-08-12 16:36:04 -07:00
git-rev-parse.txt	parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse	2009-06-13 17:08:37 -07:00
git-revert.txt
git-rm.txt
git-send-email.txt	Merge branch 'jc/1.7.0-send-email-no-thread-default'	2009-12-26 14:03:17 -08:00
git-send-pack.txt	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
git-sh-setup.txt
git-shell.txt	git-shell: Add 'git-upload-archive' to allowed commands.	2009-04-11 11:01:15 -07:00
git-shortlog.txt
git-show-branch.txt	git-merge-base/git-show-branch --merge-base: Documentation and test	2009-08-05 10:29:37 -07:00
git-show-index.txt
git-show-ref.txt	Show usage string for 'git show-ref -h'	2009-11-09 17:08:53 -08:00
git-show.txt
git-stage.txt
git-stash.txt	stash list: drop the default limit of 10 stashes	2009-10-19 22:28:26 -07:00
git-status.txt	status -s: respect the status.relativePaths option	2009-11-26 19:15:57 -08:00
git-stripspace.txt
git-submodule.txt	git submodule add: make the <path> parameter optional	2009-09-22 12:24:49 -07:00
git-svn.txt	Document git-svn's first-parent rule	2009-11-16 23:33:58 -08:00
git-symbolic-ref.txt	Fix typos in git-remote.txt and git-symbolic-ref.txt	2009-08-10 19:05:00 -07:00
git-tag.txt	UI consistency: allow --force for where -f means force	2009-08-29 14:08:03 -07:00
git-tar-tree.txt
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt	git-update-index.txt: Document the --really-refresh option.	2009-11-10 10:38:13 -08:00
git-update-ref.txt
git-update-server-info.txt	Remove obsolete bug warning in man git-update-server-info	2009-04-25 09:29:38 -07:00
git-upload-archive.txt
git-upload-pack.txt	Remove post-upload-hook	2009-12-10 12:21:40 -08:00
git-var.txt	Teach git var about GIT_PAGER	2009-11-13 12:20:47 -08:00
git-verify-pack.txt	verify-pack --stat-only: show histogram without verifying	2009-08-07 20:45:31 -07:00
git-verify-tag.txt
git-web--browse.txt
git-whatchanged.txt
git-write-tree.txt	Minor improvement to the write-tree documentation	2009-08-26 12:05:58 -07:00
git.txt	Git 1.6.6	2009-12-23 12:23:11 -08:00
gitattributes.txt	Illustrate "filter" attribute with an example	2009-12-14 22:04:30 -08:00
gitcli.txt	Update "describe" documentation to match reality	2009-09-22 19:40:05 -07:00
gitcore-tutorial.txt	Merge branch 'maint'	2009-12-01 12:47:04 -08:00
gitcvs-migration.txt	gitcvs-migration: Link to git-cvsimport documentation	2009-04-20 13:45:02 -07:00
gitdiffcore.txt
gitglossary.txt
githooks.txt	Sync with 1.6.5.6	2009-12-10 16:20:59 -08:00
gitignore.txt	Documentation: clarify .gitattributes search	2009-04-07 21:58:25 -07:00
gitk.txt
gitmodules.txt	git-submodule: add support for --merge.	2009-06-03 00:09:16 -07:00
gitrepository-layout.txt
gittutorial-2.txt
gittutorial.txt	Makes some cleanup/review in gittutorial	2009-06-30 11:17:55 -07:00
gitworkflows.txt	gitworkflows: Consistently back-quote git commands	2009-11-26 18:33:34 -08:00
glossary-content.txt	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh
mailmap.txt
Makefile	Sync with 1.6.5.5	2009-12-05 11:39:13 -08:00
manpage-1.72.xsl	Documentation: move quieting params into manpage-base.xsl	2009-03-27 00:33:19 -07:00
manpage-base-url.xsl.in	Documentation: Avoid use of xmlto --stringparam	2009-12-05 10:03:49 -08:00
manpage-base.xsl	Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set	2009-04-01 11:02:42 -07:00
manpage-bold-literal.xsl	Documentation: option to render literal text as bold for manpages	2009-03-27 00:33:20 -07:00
manpage-normal.xsl	Documentation: move "spurious .sp" code into manpage-base.xsl	2009-03-27 00:33:19 -07:00
manpage-quote-apos.xsl	Quote ' as \(aq in manpages	2009-10-22 12:59:50 -07:00
manpage-suppress-sp.xsl	Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set	2009-04-01 11:02:42 -07:00
merge-config.txt	mergetool--lib: add p4merge as a pre-configured mergetool option	2009-10-28 16:48:20 -07:00
merge-options.txt	Merge branch 'bg/merge-ff-only'	2009-11-10 12:32:59 -08:00
merge-strategies.txt	Documentation: clarify 'ours' merge strategy	2009-11-15 12:26:08 -08:00
pretty-formats.txt	Merge branch 'jc/pretty-lf'	2009-11-30 14:44:22 -08:00
pretty-options.txt
pull-fetch-param.txt	Merge branch 'bg/fetch-multi'	2009-11-23 00:03:15 -08:00
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.7.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.6.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.6.txt
RelNotes-1.5.6.txt
RelNotes-1.6.0.1.txt
RelNotes-1.6.0.2.txt
RelNotes-1.6.0.3.txt
RelNotes-1.6.0.4.txt
RelNotes-1.6.0.5.txt
RelNotes-1.6.0.6.txt
RelNotes-1.6.0.txt
RelNotes-1.6.1.1.txt
RelNotes-1.6.1.2.txt
RelNotes-1.6.1.3.txt
RelNotes-1.6.1.4.txt	GIT 1.6.1.4	2009-05-03 15:29:31 -07:00
RelNotes-1.6.1.txt
RelNotes-1.6.2.1.txt
RelNotes-1.6.2.2.txt	GIT 1.6.2.2	2009-04-02 12:34:16 -07:00
RelNotes-1.6.2.3.txt	GIT 1.6.2.3	2009-04-12 15:57:58 -07:00
RelNotes-1.6.2.4.txt	GIT 1.6.2.4	2009-04-19 17:34:26 -07:00
RelNotes-1.6.2.5.txt	GIT 1.6.2.5	2009-05-03 16:54:14 -07:00
RelNotes-1.6.2.txt
RelNotes-1.6.3.1.txt	GIT 1.6.3.1	2009-05-12 22:30:29 -07:00
RelNotes-1.6.3.2.txt	GIT 1.6.3.2	2009-06-03 22:47:48 -07:00
RelNotes-1.6.3.3.txt	GIT 1.6.3.3	2009-06-21 21:15:50 -07:00
RelNotes-1.6.3.4.txt	GIT 1.6.3.4	2009-07-28 23:59:30 -07:00
RelNotes-1.6.3.txt	GIT 1.6.3	2009-05-06 18:16:40 -07:00
RelNotes-1.6.4.1.txt	GIT 1.6.4.1	2009-08-21 20:16:10 -07:00
RelNotes-1.6.4.2.txt	GIT 1.6.4.2	2009-08-29 14:31:01 -07:00
RelNotes-1.6.4.3.txt	GIT 1.6.4.3	2009-09-13 01:28:13 -07:00
RelNotes-1.6.4.4.txt	GIT 1.6.4.4	2009-09-16 14:53:26 -07:00
RelNotes-1.6.4.txt	GIT 1.6.4	2009-07-29 00:32:42 -07:00
RelNotes-1.6.5.1.txt	GIT 1.6.5.1	2009-10-16 23:57:19 -07:00
RelNotes-1.6.5.2.txt	GIT 1.6.5.2	2009-10-25 18:37:56 -07:00
RelNotes-1.6.5.3.txt	Git 1.6.5.3	2009-11-16 00:05:12 -08:00
RelNotes-1.6.5.4.txt	Prepare for 1.6.5.4	2009-12-02 10:29:00 -08:00
RelNotes-1.6.5.5.txt	Git 1.6.5.5	2009-12-05 11:08:35 -08:00
RelNotes-1.6.5.6.txt	Git 1.6.5.6	2009-12-10 15:42:30 -08:00
RelNotes-1.6.5.7.txt	Git 1.6.5.7	2009-12-16 12:45:25 -08:00
RelNotes-1.6.5.txt	GIT 1.6.5	2009-10-10 00:05:19 -07:00
RelNotes-1.6.6.1.txt	Start 1.6.6.X maintenance track	2009-12-26 14:20:09 -08:00
RelNotes-1.6.6.txt	Git 1.6.6	2009-12-23 12:23:11 -08:00
RelNotes-1.7.0.txt	Kick off 1.7.0 cycle	2009-12-26 14:11:46 -08:00
rev-list-options.txt	Documentation: update descriptions of revision options related to '--bisect'	2009-11-24 01:00:34 -08:00
SubmittingPatches	SubmittingPatches: itemize and reflect upon well written changes	2009-04-28 00:40:00 -07:00
urls-remotes.txt	Allow push and fetch urls to be different	2009-06-09 23:46:47 -07:00
urls.txt	Add url.<base>.pushInsteadOf: URL rewriting for push only	2009-09-08 01:18:46 -07:00
user-manual.conf
user-manual.txt	Merge branch 'mm/maint-hint-failed-merge'	2009-11-23 22:31:51 -08:00