From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 6 Dec 2008 04:02:15 +0000 (-0800)
Subject: Merge branch 'jc/am-options'
X-Git-Tag: v1.6.1-rc2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d8af75d76f224eb8311bc3815f36cf126d309277;p=git.git

Merge branch 'jc/am-options'

* jc/am-options:
  git-am: rename apply_opt_extra file to apply-opt
  Test that git-am does not lose -C/-p/--whitespace options
  git-am: propagate --3way options as well
  git-am: propagate -C<n>, -p<n> options as well
  git-am --whitespace: do not lose the command line option
---

d8af75d76f224eb8311bc3815f36cf126d309277