Merge branch 'tr/add-i-e'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jul 2008 22:14:59 +0000 (15:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jul 2008 22:14:59 +0000 (15:14 -0700)
commit69b060c84e25c2cb90b16bd0ba602bc14102e1ae
treeb865f4f5d9f3e42ddd3c0a49228c2f57b326b4ec
parenta9a3e82e6d0018ff42ec11fd9560c1ff47add824
parentac083c47ea226b470afab39d975e718a475a3c78
Merge branch 'tr/add-i-e'

* tr/add-i-e:
  git-add--interactive: manual hunk editing mode
  git-add--interactive: remove hunk coalescing
  git-add--interactive: replace hunk recounting with apply --recount