summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-03-24 08:20:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-24 13:21:24 (GMT)
commitcdb5330a9baa64c28473fb0f446ca2242d6971fb (patch)
treeed2418ab41323ba875ac13d5969a085614873457 /git-rebase--merge.sh
parent16bb3d714dcb1bf50f7f96b957c4306dc6df137e (diff)
downloadgit-cdb5330a9baa64c28473fb0f446ca2242d6971fb.zip
git-cdb5330a9baa64c28473fb0f446ca2242d6971fb.tar.gz
git-cdb5330a9baa64c28473fb0f446ca2242d6971fb.tar.bz2
am: avoid diff_opt_parse()
diff_opt_parse() is a heavy hammer to just set diff filter. But it's the only way because of the diff_status_letters[] mapping. Add a new API to set diff filter and use it in git-am. diff_opt_parse()'s only remaining call site in revision.c will be gone soon and having it here just because of git-am does not make sense. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions