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:02 -0800 |
| commit | 22db240dd1791b32e7f6d25a466c2835bdccb51e (patch) | |
| tree | 5a3d5b0d6e6e328a7dbaa1c50560551faa643c76 /git-merge-one-file.sh | |
| parent | git-am: propagate -C<n>, -p<n> options as well (diff) | |
| download | tgif-22db240dd1791b32e7f6d25a466c2835bdccb51e.tar.xz | |
git-am: propagate --3way options as well
The reasoning is the same as the previous patch, where we made -C<n>
and -p<n> propagate across a failure.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions