Files
git/Documentation
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
..
2009-10-01 08:21:35 -04:00
2009-12-19 23:20:16 -08:00
2009-12-26 14:03:16 -08:00
2009-04-06 00:27:09 -07:00
2007-07-24 00:47:05 -07:00
2009-12-27 23:01:32 -08:00
2009-11-23 00:03:15 -08:00
2009-07-22 21:54:54 -07:00
2009-04-18 14:45:59 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2009-08-12 16:36:04 -07:00
2008-08-08 18:27:19 -07:00
2008-08-01 23:21:44 -07:00
2009-12-10 12:21:40 -08:00
2009-11-13 12:20:47 -08:00
2008-08-01 23:21:44 -07:00
2009-12-23 12:23:11 -08:00
2009-12-01 12:47:04 -08:00
2009-12-10 16:20:59 -08:00
2009-12-05 11:39:13 -08:00
2009-11-30 14:44:22 -08:00
2007-07-02 00:35:58 -07:00
2007-07-12 12:01:47 -07:00
2007-08-15 15:01:20 -07:00
2007-09-19 03:11:28 -07:00
2008-01-29 22:00:34 -08:00
2007-10-03 02:33:48 -07:00
2007-11-18 14:00:38 -08:00
2007-12-01 11:20:00 -08:00
2008-01-07 22:41:43 -08:00
2008-02-17 00:20:38 -08:00
2008-02-17 00:20:38 -08:00
2008-02-23 11:31:04 -08:00
2008-06-26 17:11:21 -07:00
2008-12-16 22:06:47 -08:00
2008-02-01 19:10:10 -08:00
2008-04-20 11:36:53 -07:00
2008-05-25 21:11:24 -07:00
2008-05-27 22:32:47 -07:00
2008-06-07 11:45:48 -07:00
2008-06-26 17:59:51 -07:00
2008-12-16 22:08:28 -08:00
2008-04-07 21:57:43 -07:00
2008-06-25 17:13:48 -07:00
2008-07-04 01:38:41 -07:00
2008-07-13 15:23:43 -07:00
2008-07-19 10:58:01 -07:00
2008-08-06 13:40:53 -07:00
2008-12-16 22:13:36 -08:00
2008-06-18 13:09:43 -07:00
2008-08-24 14:47:24 -07:00
2008-10-21 13:37:42 -07:00
2008-12-07 15:11:54 -08:00
2008-12-19 19:27:35 -08:00
2008-08-17 11:42:10 -07:00
2009-02-07 00:51:47 -08:00
2009-05-03 15:29:31 -07:00
2008-12-24 19:41:08 -08:00
2009-03-15 13:05:05 -07:00
2009-04-02 12:34:16 -07:00
2009-04-12 15:57:58 -07:00
2009-04-19 17:34:26 -07:00
2009-05-03 16:54:14 -07:00
2009-03-03 23:37:19 -08:00
2009-05-12 22:30:29 -07:00
2009-06-03 22:47:48 -07:00
2009-06-21 21:15:50 -07:00
2009-07-28 23:59:30 -07:00
2009-05-06 18:16:40 -07:00
2009-08-21 20:16:10 -07:00
2009-08-29 14:31:01 -07:00
2009-09-13 01:28:13 -07:00
2009-09-16 14:53:26 -07:00
2009-07-29 00:32:42 -07:00
2009-10-16 23:57:19 -07:00
2009-10-25 18:37:56 -07:00
2009-11-16 00:05:12 -08:00
2009-12-02 10:29:00 -08:00
2009-12-05 11:08:35 -08:00
2009-12-10 15:42:30 -08:00
2009-12-16 12:45:25 -08:00
2009-10-10 00:05:19 -07:00
2009-12-23 12:23:11 -08:00
2009-12-26 14:11:46 -08:00