author | Junio C Hamano <gitster@pobox.com> | |
Sat, 29 Aug 2009 02:38:19 +0000 (19:38 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 29 Aug 2009 02:38:19 +0000 (19:38 -0700) | ||
commit | 433233e0b60e55e1afcded413e78c85fde4db722 | |
tree | d0bcce5903758c00958bc925461ed5bd5dda148f | tree | snapshot |
parent | 42fa6df99fe1f0439244893e81efad0cc4524c3d | commit | diff |
parent | 3fa509dfbdb8526453f4213f79b371bdfa493f0e | commit | diff |
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
* 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
diff-lib.c | diff1 | | diff2 | | blob | history |