diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-04 15:38:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-04 18:45:01 -0800 |
| commit | a20033796b312390ea8a50917bea623efd6fad97 (patch) | |
| tree | ec21ba6562db30543964254822e1e5744ec9bc6c /git-merge-one-file.sh | |
| parent | git-am --whitespace: do not lose the command line option (diff) | |
| download | tgif-a20033796b312390ea8a50917bea623efd6fad97.tar.xz | |
git-am: propagate -C<n>, -p<n> options as well
These options are meant to deal with patches that do not apply cleanly
due to the differences between the version the patch was based on and
the version "git am" is working on.
Because a series of patches applied in the same "git am" run tends to
come from the same source, it is more useful to propagate these options
after the application stops.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions