diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-11 23:02:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-11 23:02:25 -0400 |
| commit | b9ac5854549636493449fea6830364a01159fbf6 (patch) | |
| tree | 722dbf07ac4b44a3a5ba44b2169ccf2d8471a99d /.gitattributes | |
| parent | d3d9c8a9a68fe74208d08ca4e59670934891d489 (diff) | |
more efficient union merges
Tries to avoid generating a new object when the merged content has the same
lines that were in the old object.
I've noticed some merge commits that only move lines around, like this:
- 1323478057.181191s 1 be23c3ac-0ee5-11e0-b185-3b0f9b5b00c5
1323204972.062151s 1 87e06c7a-7388-11e0-ba07-03cdf300bd87
++1323478057.181191s 1 be23c3ac-0ee5-11e0-b185-3b0f9b5b00c5
Unsure if this will really save anything in practice, since it only looks
at one of the two old objects, and maybe I didn't pick the best one.
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions