diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-12 23:47:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-12 23:47:31 -0700 |
| commit | b75aaa546e0593440d85c77d380c9b53e126ea02 (patch) | |
| tree | 30e9c710db9fd896f34d211bd5acaa93f4924cd0 /builtin-merge-recursive.c | |
| parent | gc: call "prune --expire 2.weeks.ago" by default (diff) | |
| parent | git-cvsimport: fix merging with remote parent branch (diff) | |
| download | git-b75aaa546e0593440d85c77d380c9b53e126ea02.tar.gz git-b75aaa546e0593440d85c77d380c9b53e126ea02.zip | |
Merge branch 'maint'
* maint:
git-cvsimport: fix merging with remote parent branch
gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions