git add -p

git

何入力すれば良いのか分からない場合は ? で良い模様。

Stage this hunk [y,n,q,a,d,/,K,j,J,g,e,?]? ?
y - stage this hunk
n - do not stage this hunk
q - quit; do not stage this hunk nor any of the remaining ones
a - stage this hunk and all later hunks in the file
d - do not stage this hunk nor any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
e - manually edit the current hunk
? - print help

ええと、split すりゃ良いのか (何
つうかこれ以上は駄目なの? と言いつつ e してみると vi 起動。不要な行を削除で何とかなったみたい。

とは言え

やはり後から commit 分割とか色々無理。