summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-01 04:26:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-01 06:38:40 (GMT)
commit12cbbdc40b50458b29b76af740ddc0ab1979b322 (patch)
tree142e880c79b3f92a100b8208bc195d2292708794 /git-merge-stupid.sh
parent56248c5a5c77f65fe591dfec3ac413147d227ec4 (diff)
downloadgit-12cbbdc40b50458b29b76af740ddc0ab1979b322.zip
git-12cbbdc40b50458b29b76af740ddc0ab1979b322.tar.gz
git-12cbbdc40b50458b29b76af740ddc0ab1979b322.tar.bz2
git-am: --whitespace=x option.
This is passed down to git-apply to override the built-in default and per-repository configuration at runtime. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions