]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca83dc5 5c30b8f)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:47:09 +0000 (22:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:47:09 +0000 (22:47 -0800)
* maint:
  add-interactive: fix deletion of non-empty files
  pull: clarify advice for the unconfigured error case

1  2 
git-add--interactive.perl patch | diff1 | diff2 | blob | history
git-pull.sh patch | diff1 | diff2 | blob | history

diff --cc git-add--interactive.perl
Simple merge
diff --cc git-pull.sh
Simple merge
Git mirror and local development