summaryrefslogtreecommitdiff
path: root/index-pack.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-05-25 14:03:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-25 14:03:50 -0700
commit0166592495e21b075fa48225ff21568269bf51d4 (patch)
tree21c295f211ad2aeaa798222e7c5564f17a90a429 /index-pack.c
parentMerge branch 'ar/t6031' (diff)
parentMake git add -n and git -u -n output consistent (diff)
downloadtgif-0166592495e21b075fa48225ff21568269bf51d4.tar.xz
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
Diffstat (limited to 'index-pack.c')
0 files changed, 0 insertions, 0 deletions