]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6dbcb59 331fcb5)
Merge branch 'jc/rm-i-t-a'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Dec 2008 08:38:12 +0000 (00:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Dec 2008 08:38:12 +0000 (00:38 -0800)
commitae26e7c74970281bd3597c79e44a8b54a927bbe1
treeab91c9e9de975fd469f81795a5f53026050b2b71tree | snapshot
parent6dbcb59e8271c16cbec486932bd3069279e09c60commit | diff
parent331fcb598ec0127fd89c992361bc573dcd3a4a63commit | diff
Merge branch 'jc/rm-i-t-a'

* jc/rm-i-t-a:
  git add --intent-to-add: do not let an empty blob be committed by accident
  git add --intent-to-add: fix removal of cached emptiness
  builtin-rm.c: explain and clarify the "local change" logic
  Extend index to save more flags
Unnamed repository; edit this file 'description' to name the repository.