Merge branch 'js/add-edit'
commit362724af6cf5edf35832ba0dbc7783806a38871e
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 16:00:06 +0000 (18 09:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 16:00:06 +0000 (18 09:00 -0700)
treec66f9012eb1ee65b48a663333017ddaaee964886
parentc16cea73451f95954b970d34e1120f87dae052c8
parent7c8224b6a8c16c84938ad7c31cb98e55cb1e8cfd
Merge branch 'js/add-edit'

* js/add-edit:
  t3702: fix reliance on SHELL_PATH being '/bin/sh'
  git-add: introduce --edit (to edit the diff vs. the index)
Documentation/git-add.txt