diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-25 18:29:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-25 18:29:14 -0700 |
| commit | 41e98de4280dbb340e64da0a0129edbda9108ccf (patch) | |
| tree | 3a810f10511cdb4acbcffe69dd2698e7a91601b9 /builtin-merge-ours.c | |
| parent | 3015fa5846c19e79f99c1d6a49fd2510ed9291b8 (diff) | |
| parent | e636106c76e0273334940d899de1c928d08b29e8 (diff) | |
| download | git-41e98de4280dbb340e64da0a0129edbda9108ccf.tar.gz git-41e98de4280dbb340e64da0a0129edbda9108ccf.tar.xz | |
Merge branch 'maint'
* maint:
GIT 1.5.6.1
fix update-hook-example to work with packed tag references
clone: create intermediate directories of destination repo
for-each-ref: implement missing tag values
git-rebase.sh: Add check if rebase is in progress
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions