merge: do not add standard message when message is given with -m option

Junio C Hamano committed almost 17 years ago

Do not misidentify "git merge foo HEAD" as an old-style invocation

Junio C Hamano committed almost 17 years ago

Allow curl to rewind the RPC read buffer

Martin Storsjö committed almost 17 years ago

Update draft release notes to 1.6.6 before -rc1

Junio C Hamano committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/deprecate-old-syntax-from-merge'

Junio C Hamano committed almost 17 years ago

git-merge: a deprecation notice of the ancient command line syntax

Junio C Hamano committed almost 17 years ago

Merge branch 'bw/remote-get-ref-states-fix'

Junio C Hamano committed almost 17 years ago

get_ref_states: strdup entries and free util in stale list

Bert Wesarg committed almost 17 years ago

help: Do not unnecessarily look for a repository

David Aguilar committed almost 17 years ago

Documentation: Fix a few i.e./e.g. mix-ups

Michael J Gruber committed almost 17 years ago

Merge branch 'jn/gitweb-blame'

Junio C Hamano committed almost 17 years ago

gitweb: Add link to other blame implementation in blame views

Jakub Narebski committed almost 17 years ago

gitweb: Make linking to actions requiring JavaScript a feature

Jakub Narebski committed almost 17 years ago

Merge branch 'fc/maint-format-patch-pathspec-dashes'

Junio C Hamano committed almost 17 years ago

Merge branch 'mm/maint-merge-ff-error-message-fix'

Junio C Hamano committed almost 17 years ago

Merge branch 'ap/maint-merge-strategy-list-fix'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/pretty-lf'

Junio C Hamano committed almost 17 years ago

Merge branch 'cc/bisect-doc'

Junio C Hamano committed almost 17 years ago

Merge branch 'em/commit-claim'

Junio C Hamano committed almost 17 years ago