diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-20 15:22:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-20 15:22:39 -0700 |
| commit | 44a9b53c599447a706dd4ae8a00fd8b4bed093b9 (patch) | |
| tree | c74c4e45ebad4b84b0651f05c6920db447af34fd /Documentation/technical/trivial-merge.txt | |
| parent | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint (diff) | |
| parent | filter-branch: remove multi-line headers in msg filter (diff) | |
| download | tgif-44a9b53c599447a706dd4ae8a00fd8b4bed093b9.tar.xz | |
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint
A recent "filter-branch --msg-filter" broke skipping of the commit
object header, which is fixed.
* jk/filter-branch-use-of-sed-on-incomplete-line:
filter-branch: remove multi-line headers in msg filter
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions