Merge branch 'rr/triangle'

Junio C Hamano committed over 13 years ago

Merge branch 'mm/status-during-revert'

Junio C Hamano committed over 13 years ago

Merge branch 'jk/set-upstream-error-cases'

Junio C Hamano committed over 13 years ago

Merge branch 'jk/filter-branch-come-back-to-original'

Junio C Hamano committed over 13 years ago

format-patch: trivial cleanups

Felipe Contreras committed over 13 years ago

format-patch: add format.coverLetter configuration variable

Felipe Contreras committed over 13 years ago

log: update to OPT_BOOL

Felipe Contreras committed over 13 years ago

format-patch: refactor branch name calculation

Felipe Contreras committed over 13 years ago

format-patch: improve head calculation for cover-letter

Felipe Contreras committed over 13 years ago

Sync with 1.8.1.6

Junio C Hamano committed over 13 years ago

fmt-merge-msg: use core.commentchar in tag signatures completely

Ralf Thielow committed over 13 years ago

fmt-merge-msg: respect core.commentchar in people credits

Ralf Thielow committed over 13 years ago

Git 1.8.1.6

Junio C Hamano committed over 13 years ago

Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1

Junio C Hamano committed over 13 years ago

remote-helpers/test-bzr.sh: do not use "grep '\s'"

Torsten Bögershausen committed over 13 years ago

send-email: make annotate configurable

Felipe Contreras committed over 13 years ago

gitremote-helpers(1): clarify refspec behaviour

John Keeping committed over 13 years ago

fast-export: Allow pruned-references in mark file

Antoine Pelisse committed over 13 years ago

remote-bzr: add utf-8 support for pushing

Felipe Contreras committed over 13 years ago

remote-bzr: add utf-8 support for fetching

Timotheus Pokorra committed over 13 years ago