diff options
| author |  Doug Kelly <dougk.ff7@gmail.com> | 2015-01-07 14:32:11 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-01-07 19:45:05 -0800 |
| commit | fe7611c46f34cc4164a719a94e88e13ca5c978b1 (patch) | |
| tree | 68265c9de1f6b3f1669bc39446bc72a7ac6c5601 /Documentation/i18n.txt | |
| parent | Merge branch 'maint-2.1' into maint (diff) | |
| download | tgif-fe7611c46f34cc4164a719a94e88e13ca5c978b1.tar.xz | |
t4255: test am submodule with diff.submodule
git am will break when using diff.submodule=log; add some test cases
to illustrate this breakage as simply as possible. There are
currently two ways this can fail:
* With errors ("unrecognized input"), if only change
* Silently (no submodule change), if other files change
Test for both conditions and ensure without diff.submodule this works.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Doug Kelly <dougk.ff7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/i18n.txt')
0 files changed, 0 insertions, 0 deletions