summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authormartin f. krafft <madduck@madduck.net>2009-01-23 11:31:21 +1100
committerJunio C Hamano <gitster@pobox.com>2009-01-23 17:00:12 -0800
commitb80da424a13107c239ed40573fae3d692d19b6cd (patch)
tree48fd506aeee6cc46c23f2c0b1ef43db37b382ae0 /t/t7610-mergetool.sh
parentd930508903909ad5e700dd25e3858a1b2d69ed12 (diff)
downloadgit-b80da424a13107c239ed40573fae3d692d19b6cd.tar.gz
git-am: implement --reject option passed to git-apply
With --reject, git-am simply passes the --reject option to git-apply and thus allows people to work with reject files if they so prefer. Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions