Google Git
Sign in
googlers / jrn / git / eec8c633c117c83a9fd2be7054b169d3cee5806d
commiteec8c633c117c83a9fd2be7054b169d3cee5806d[log] [tgz]
authorLinus Torvalds <torvalds@ppc970.osdl.org>Sat Apr 16 12:43:32 2005 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>Sat Apr 16 12:43:32 2005 -0700
tree59c9ea857e563de5e3bb27f0cb6133a6f22c8964
parent2fbdd1317480d2f14756d94e41a8eb07442d4841 [diff]
Add "--unmerged" flag to "show-files", which does what the name implies.

The flag also implies "--stage", since unmerged file information doesn't
make sense without the full output.
1 file changed
tree: 59c9ea857e563de5e3bb27f0cb6133a6f22c8964
  1. cache.h
  2. cat-file.c
  3. check-files.c
  4. checkout-cache.c
  5. commit-tree.c
  6. COPYING
  7. diff-tree.c
  8. fsck-cache.c
  9. init-db.c
  10. ls-tree.c
  11. Makefile
  12. read-cache.c
  13. read-tree.c
  14. README
  15. rev-tree.c
  16. revision.h
  17. show-diff.c
  18. show-files.c
  19. update-cache.c
  20. write-tree.c