builtin/merge.c: drop a parameter that is never used

Junio C Hamano committed almost 12 years ago

push: heed user.signingkey for signed pushes

Michael J Gruber committed almost 12 years ago

diff -B -M: fix output for "copy and then rewrite" case

Junio C Hamano committed almost 12 years ago

Update draft release notes to 2.2

Junio C Hamano committed almost 12 years ago

Merge branch 'js/completion-hide-not-a-repo'

Junio C Hamano committed almost 12 years ago

Merge branch 'da/mergetool-meld'

Junio C Hamano committed almost 12 years ago

Merge branch 'da/mergetool-temporary-directory'

Junio C Hamano committed almost 12 years ago

Merge branch 'da/mergetool-tool-help'

Junio C Hamano committed almost 12 years ago

Merge branch 'da/mergetool-temporary-filename'

Junio C Hamano committed almost 12 years ago

Merge branch 'da/mergetool-tests'

Junio C Hamano committed almost 12 years ago

Merge branch 'rs/ref-transaction'

Junio C Hamano committed almost 12 years ago

mergetool: rename bc3 to bc

Junio C Hamano committed almost 12 years ago

dir.c: remove the second declaration of "stk" in prep_exclude()

Nguyễn Thái Ngọc Duy committed almost 12 years ago

.mailmap: add Stefan Bellers corporate mail address

Stefan Beller committed almost 12 years ago

transport: free leaking head in transport_print_push_status()

Stefan Beller committed almost 12 years ago

Update draft release notes to 2.2

Junio C Hamano committed almost 12 years ago

Merge branch 'cc/interpret-trailers'

Junio C Hamano committed almost 12 years ago

Merge branch 'rm/gitweb-start-form'

Junio C Hamano committed almost 12 years ago

Merge branch 'ss/contrib-subtree-contacts'

Junio C Hamano committed almost 12 years ago

Merge branch 'jn/parse-config-slot'

Junio C Hamano committed almost 12 years ago