From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 May 2009 16:00:06 +0000 (-0700)
Subject: Merge branch 'js/add-edit'
X-Git-Tag: v1.6.4-rc0~158
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=362724af6cf5edf35832ba0dbc7783806a38871e;p=git.git

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)
---

362724af6cf5edf35832ba0dbc7783806a38871e