![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 6 Dec 2008 04:02:15 +0000 (20:02 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 6 Dec 2008 04:02:15 +0000 (20:02 -0800) | ||
| commit | d8af75d76f224eb8311bc3815f36cf126d309277 | |
| tree | c3ccda9401edc5df20f7158186ce78ff41746d6d | tree | snapshot |
| parent | 7f705dc3686c2b1c77172b6847c1406eb66a20c3 | commit | diff |
| parent | 9b9f5a2258e6df611d2903d84fd8d41806ce0e00 | commit | diff |
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
* 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