diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-13 00:24:04 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-13 00:24:04 +0400 |
| commit | 3103c005207f0840782804b9387b3a831005bb9c (patch) | |
| tree | 51d1c31f842c5f56e3dd42eeb9ca0980e716853c /combine-diff.c | |
| parent | 8bc7574b6332ef45645c6e0917e9d59919b277ef (diff) | |
| parent | f4ee3eb68906f079dea45de4f1bbb03d68189eb3 (diff) | |
Merge branch 'master' into jc/combine
* master:
stripspace: make sure not to leave an incomplete line.
git-commit: do not muck with commit message when no_edit is set.
When showing a commit message, do not lose an incomplete line.
Retire t5501-old-fetch-and-upload test.
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions