diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-08-28 19:38:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-28 19:38:19 -0700 |
| commit | 433233e0b60e55e1afcded413e78c85fde4db722 (patch) | |
| tree | d0bcce5903758c00958bc925461ed5bd5dda148f /builtin-merge.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | git commit --dry-run -v: show diff in color when asked (diff) | |
| download | tgif-433233e0b60e55e1afcded413e78c85fde4db722.tar.xz | |
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
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions