![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 25 May 2008 21:03:50 +0000 (14:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 25 May 2008 21:03:50 +0000 (14:03 -0700) | ||
| commit | 0166592495e21b075fa48225ff21568269bf51d4 | |
| tree | 21c295f211ad2aeaa798222e7c5564f17a90a429 | tree | snapshot |
| parent | 488ee2fe21ca69b90aa2b43dc9e30279a12cca63 | commit | diff |
| parent | 205ffa94be8f6492eef4bdaa3315e7fdc7e64e0b | commit | diff |
Merge branch 'jc/add-n-u'
* jc/add-n-u:
Make git add -n and git -u -n output consistent
"git-add -n -u" should not add but just report
Conflicts:
builtin-add.c
builtin-mv.c
cache.h
read-cache.c
* jc/add-n-u:
Make git add -n and git -u -n output consistent
"git-add -n -u" should not add but just report
Conflicts:
builtin-add.c
builtin-mv.c
cache.h
read-cache.c
| builtin-add.c | diff1 | | diff2 | | blob | history |
| builtin-mv.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| read-cache.c | diff1 | | diff2 | | blob | history |