diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:40 -0700 |
| commit | c8ada15456f951913dbf628a7c441032e90b8e11 (patch) | |
| tree | 60e0e012e23b909c6938b2f164b1c8f92bed518a /t/t7610-mergetool.sh | |
| parent | Merge branch 'tg/t0021-racefix' (diff) | |
| parent | am: reload .gitattributes after patching it (diff) | |
| download | tgif-c8ada15456f951913dbf628a7c441032e90b8e11.tar.xz | |
Merge branch 'bc/reread-attributes-during-rebase'
The "git am" based backend of "git rebase" ignored the result of
updating ".gitattributes" done in one step when replaying
subsequent steps.
* bc/reread-attributes-during-rebase:
am: reload .gitattributes after patching it
path: add a function to check for path suffix
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions