diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-09 19:26:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 19:26:40 (GMT) |
| commit | c8ada15456f951913dbf628a7c441032e90b8e11 (patch) | |
| tree | 60e0e012e23b909c6938b2f164b1c8f92bed518a /gitk-git/gitk | |
| parent | 8f3ba423e7149fdbe1d7e1d2f245b4c0a2a1bdfb (diff) | |
| parent | 2c65d90f7579a0e2a6460eebce44795587e87043 (diff) | |
| download | git-c8ada15456f951913dbf628a7c441032e90b8e11.zip git-c8ada15456f951913dbf628a7c441032e90b8e11.tar.gz git-c8ada15456f951913dbf628a7c441032e90b8e11.tar.bz2 | |
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 'gitk-git/gitk')
0 files changed, 0 insertions, 0 deletions