diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-05 20:02:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-05 20:02:15 -0800 |
| commit | d8af75d76f224eb8311bc3815f36cf126d309277 (patch) | |
| tree | c3ccda9401edc5df20f7158186ce78ff41746d6d /builtin-fetch-pack.c | |
| parent | 7f705dc3686c2b1c77172b6847c1406eb66a20c3 (diff) | |
| parent | 9b9f5a2258e6df611d2903d84fd8d41806ce0e00 (diff) | |
| download | git-d8af75d76f224eb8311bc3815f36cf126d309277.tar.gz | |
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
Diffstat (limited to 'builtin-fetch-pack.c')
0 files changed, 0 insertions, 0 deletions