]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a450b4 4d55200)
Merge branch 'nd/ita-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2016 19:43:25 +0000 (11:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2016 19:43:25 +0000 (11:43 -0800)
commitcc14ea8cf4520a9607fba4b1fbacea7fa9723c73
treef5a5fb76eba752964fa48622cbce21f3b796f7f5tree | snapshot
parent7a450b48e765e957762b015f30c89f21b1028771commit | diff
parent4d552005323034c1d6311796ac1074e9a4b4b57ecommit | diff
Merge branch 'nd/ita-cleanup'

Paths that have been told the index about with "add -N" are not
quite yet in the index, but a few commands behaved as if they
already are in a harmful way.

* nd/ita-cleanup:
  grep: make it clear i-t-a entries are ignored
  add and use a convenience macro ce_intent_to_add()
  blame: remove obsolete comment
builtin/blame.c diff1 | diff2 | blob | history
builtin/grep.c diff1 | diff2 | blob | history
builtin/rm.c diff1 | diff2 | blob | history
cache-tree.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
read-cache.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.