summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-12-05 11:19:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-05 20:02:10 -0800
commit9b9f5a2258e6df611d2903d84fd8d41806ce0e00 (patch)
tree44ae4af3938c4c927319e533495a77bae20f0408 /git-merge-one-file.sh
parentTest that git-am does not lose -C/-p/--whitespace options (diff)
downloadtgif-9b9f5a2258e6df611d2903d84fd8d41806ce0e00.tar.xz
git-am: rename apply_opt_extra file to apply-opt
All other state files use dash in their names, not underscores. Also, there is no reason to call this "extra". Drop it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions