diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-09 05:57:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-09 05:57:57 (GMT) |
| commit | c3958a7926ab20b90fe0767580b466698477f5b6 (patch) | |
| tree | 80bf9ad53c61e817ad7269bb0f8f8e0a8ae8f1d9 /git-reset-script | |
| parent | e764a10b17610ed9b3969bdb351e09f9635eb0ab (diff) | |
| parent | c882bc932f6702a935c748893536356b0bba11ce (diff) | |
| download | git-c3958a7926ab20b90fe0767580b466698477f5b6.zip git-c3958a7926ab20b90fe0767580b466698477f5b6.tar.gz git-c3958a7926ab20b90fe0767580b466698477f5b6.tar.bz2 | |
Merge with master.
This merges commit
c882bc932f6702a935c748893536356b0bba11ce
from master into our head commit
e764a10b17610ed9b3969bdb351e09f9635eb0ab
Sincerely,
jit-merge command.
Diffstat (limited to 'git-reset-script')
0 files changed, 0 insertions, 0 deletions