diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-20 02:25:57 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-20 02:25:57 +0400 |
| commit | 6858d494926437ad7b7e9199ea39953eb90c7bab (patch) | |
| tree | d364a2e94b9771aab4f2ecd77c5866049b68e705 /git-am.sh | |
| parent | 969d326d6b54573e171c903fdf9fdc6b107c18d1 (diff) | |
| parent | 2a3870432395e78c82a870bf1a177b8d5b8fbdf0 (diff) | |
Merge part of 'js/fmt-patch' for RFC2822 dates into 'sp/reflog'
An earlier patch from Shawn Pearce dependes on a change that is
only in "next". I do not want to make this series hostage to
the yet-to-graduate js/fmt-patch branch, but let's try fixing it
by merging the early parts of the branch to see what happens.
Right now, 'sp/reflog' will not be in "next" for now, so I won't
have to regret this -- if this merge causes problem down the road
merging I can always rebuild the topic branch ;-).
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions