merge-recursive: fix parsing of "diff-algorithm" option

John Keeping committed about 13 years ago

Merge branch 'mm/rebase-continue-freebsd-WB' into maint

Jonathan Nieder committed about 13 years ago

Merge branch 'km/svn-1.8-serf-only' into maint

Jonathan Nieder committed about 13 years ago

Merge branch 'js/xread-in-full' into maint

Jonathan Nieder committed about 13 years ago

Merge branch 'bc/send-email-ssl-die-message-fix' into maint

Jonathan Nieder committed about 13 years ago

Merge branch 'bc/submodule-status-ignored'

Jonathan Nieder committed about 13 years ago

Merge branch 'cc/replace-with-the-same-type'

Jonathan Nieder committed about 13 years ago

Merge branch 'kb/msvc-compile'

Jonathan Nieder committed about 13 years ago

Merge branch 'nd/unpack-entry-optim-in-pack-objects'

Jonathan Nieder committed about 13 years ago

Merge branch 'jk/shortlog-tolerate-broken-commit'

Jonathan Nieder committed about 13 years ago

Merge branch 'jc/strcasecmp-pure-inline'

Jonathan Nieder committed about 13 years ago

Merge branch 'sg/complete-untracked-filter'

Jonathan Nieder committed about 13 years ago

Merge branch 'nd/fetch-pack-error-reporting-fix'

Jonathan Nieder committed about 13 years ago

Merge branch 'es/contacts-in-subdir'

Jonathan Nieder committed about 13 years ago

Merge branch 'jc/push-cas'

Jonathan Nieder committed about 13 years ago

Merge branch 'maint'

Jonathan Nieder committed about 13 years ago

doc: don't claim that cherry calls patch-id

Michael S. Tsirkin committed about 13 years ago

git-remote-mediawiki: bugfix for pages w/ >500 revisions

Benoit Person committed about 13 years ago

sample pre-commit hook: use --bool when retrieving config var

Johan Herland committed about 13 years ago

clone: add a period after "done" to end the sentence

Sebastian Schuberth committed about 13 years ago