| commit | 57780b0a4b9b0344ed87dc79f1435a10135cd777 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 May 2008 23:08:36 +0000 (23 16:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 May 2008 23:08:36 +0000 (23 16:08 -0700) | ||
| tree | 9d183780dbe20586cced08a7ac2a5ae5049c8aa8 | treesnapshot (tar.gz zip) |
| parent | 7ca311220765333c90e879004014c152f3a0eab0 | commitdiff |
| parent | 205ffa94be8f6492eef4bdaa3315e7fdc7e64e0b | commitdiff |
Merge branch 'jc/add-n-u' into next
* jc/add-n-u:
Make git add -n and git -u -n output consistent
Conflicts:
builtin-add.c
* jc/add-n-u:
Make git add -n and git -u -n output consistent
Conflicts:
builtin-add.c
| builtin-add.c | diff1 | diff2 | blobhistory |