diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-04 23:55:22 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-22 12:18:00 -0700 |
commit | 173e6c8852be3c543689f8613ddf3fdafd9ca7b9 (patch) | |
tree | ca8f4bbb18a8f61814ff17657992afc9db2c947c /sha1-lookup.c | |
parent | 76e2f7ce323c7ddb3a7c29e56407da6a69a4fa53 (diff) | |
download | git-173e6c8852be3c543689f8613ddf3fdafd9ca7b9.tar.gz git-173e6c8852be3c543689f8613ddf3fdafd9ca7b9.tar.xz |
git stat -s: short status output
Give -s(hort) option to "git stat" that shows the status of paths in a
more concise way.
XY PATH1 -> PATH2
format to be more machine readable than output from "git status", which is
about previewing of "git commit" with the same arguments.
PATH1 is the path in the HEAD, and " -> PATH2" part is shown only when
PATH1 corresponds to a different path in the index/worktree.
For unmerged entries, X shows the status of stage #2 (i.e. ours) and Y
shows the status of stage #3 (i.e. theirs). For entries that do not have
conflicts, X shows the status of the index, and Y shows the status of the
work tree. For untracked paths, XY are "??".
X Y Meaning
-------------------------------------------------
[MD] not updated
M [ MD] updated in index
A [ MD] added to index
D [ MD] deleted from index
R [ MD] renamed in index
C [ MD] copied in index
[MARC] index and work tree matches
[ MARC] M work tree changed since index
[ MARC] D deleted in work tree
D D unmerged, both deleted
A U unmerged, added by us
U D unmerged, deleted by them
U A unmerged, added by them
D U unmerged, deleted by us
A A unmerged, both added
U U unmerged, both modified
? ? untracked
When given -z option, the records are terminated by NUL characters for
better machine readability. Because the traditional long format is
designed for human consumption, NUL termination does not make sense.
For this reason, -z option implies -s (short output).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1-lookup.c')
0 files changed, 0 insertions, 0 deletions