]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 47847c7 4d55200)
Merge branch 'nd/ita-cleanup' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:21 +0000 (13:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:21 +0000 (13:10 -0800)
commit2bbea5c8f2242ee798e9bee525b485994a8e5911
tree87e64824719bf59565685d3c3db09ea9ce31a248tree | snapshot
parent47847c756b7de9615cf89f353d3d2a84f8a871f1commit | diff
parent4d552005323034c1d6311796ac1074e9a4b4b57ecommit | diff
Merge branch 'nd/ita-cleanup' into maint

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.