Merge branch 'js/add-edit'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 16:00:06 +0000 (09:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 16:00:06 +0000 (09:00 -0700)
* js/add-edit:
  t3702: fix reliance on SHELL_PATH being '/bin/sh'
  git-add: introduce --edit (to edit the diff vs. the index)

1  2 
Documentation/git-add.txt

Simple merge