diff options
author | Junio C Hamano <junkio@cox.net> | 2005-11-04 00:04:17 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-11-04 00:04:17 -0800 |
commit | 810bf1f9448c1db7f52cfa43c077c677fb080fce (patch) | |
tree | 1efb9b35dc2f2b8afc5c8fcf384e4e76b1ae7a80 /Documentation/git-merge.txt | |
parent | a10aad6a9a37fbafcda590a00ddaf7b2bfda940e (diff) | |
download | git-810bf1f9448c1db7f52cfa43c077c677fb080fce.tar.gz git-810bf1f9448c1db7f52cfa43c077c677fb080fce.tar.xz |
Documentation: git-add -- do not say "cache", add examples.
Its use of git-ls-files --others is very nice, but sometimes gives
surprising results, so we'd better talk about it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions