diff: unmerged path?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



What does it mean when I have an unmerged path?

jonsmirl@terra:/home/apps/u-boot$ git diff
* Unmerged path api_examples/intellon.c
jonsmirl@terra:/home/apps/u-boot$

api_examples/intellon.c is a newly created file under stgit.

-- 
Jon Smirl
jonsmirl@xxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux