From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 29 Aug 2009 02:38:19 +0000 (-0700)
Subject: Merge branch 'jc/shortstatus'
X-Git-Tag: v1.6.5-rc0~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=433233e0b60e55e1afcded413e78c85fde4db722;p=git.git

Merge branch 'jc/shortstatus'

* jc/shortstatus:
  git commit --dry-run -v: show diff in color when asked
  Documentation/git-commit.txt: describe --dry-run
  wt-status: collect untracked files in a separate "collect" phase
  Make git_status_config() file scope static to builtin-commit.c
  wt-status: move wt_status_colors[] into wt_status structure
  wt-status: move many global settings to wt_status structure
  commit: --dry-run
  status: show worktree status of conflicted paths separately
  wt-status.c: rework the way changes to the index and work tree are summarized
  diff-index: keep the original index intact
  diff-index: report unmerged new entries
---

433233e0b60e55e1afcded413e78c85fde4db722