summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-20 04:37:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-20 04:37:12 (GMT)
commitc703555cc89cf6aedf549a1233b242d8cb8e0f20 (patch)
treed886e03a2f5acab43e1425c91c7aaa6aa8268c49 /combine-diff.c
parent584f8975d2d9530a34bd0b936ae774f82fe30fed (diff)
parent40069d6e3a195c8c2414ea60ed75b84ae47f88a1 (diff)
downloadgit-c703555cc89cf6aedf549a1233b242d8cb8e0f20.zip
git-c703555cc89cf6aedf549a1233b242d8cb8e0f20.tar.gz
git-c703555cc89cf6aedf549a1233b242d8cb8e0f20.tar.bz2
Merge branch 'sb/submodule-short-status'
The output from "git status --short" has been extended to show various kinds of dirtyness in submodules differently; instead of to "M" for modified, 'm' and '?' can be shown to signal changes only to the working tree of the submodule but not the commit that is checked out. * sb/submodule-short-status: submodule.c: correctly handle nested submodules in is_submodule_modified short status: improve reporting for submodule changes submodule.c: stricter checking for submodules in is_submodule_modified submodule.c: port is_submodule_modified to use porcelain 2 submodule.c: convert is_submodule_modified to use strbuf_getwholeline submodule.c: factor out early loop termination in is_submodule_modified submodule.c: use argv_array in is_submodule_modified
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions