Merge branch 'jk/notes-merge-config'

Junio C Hamano committed about 11 years ago

Merge branch 'jc/am-state-fix'

Junio C Hamano committed about 11 years ago

Merge branch 'jc/log-p-cc'

Junio C Hamano committed about 11 years ago

Merge branch 'jk/fix-alias-pager-config-key-warnings'

Junio C Hamano committed about 11 years ago

Merge branch 'jk/rev-list-has-no-notes'

Junio C Hamano committed about 11 years ago

Merge branch 'hv/submodule-config'

Junio C Hamano committed about 11 years ago

Merge branch 'sg/config-name-only'

Junio C Hamano committed about 11 years ago

read-cache: fix indentation in read_index_from

Stefan Beller committed about 11 years ago

stash: allow "stash show" diff output configurable

Namhyung Kim committed about 11 years ago

trailer: support multiline title

Christian Couder committed about 11 years ago

t7300: fix broken && chains

Erik Elfström committed about 11 years ago

log: diagnose empty HEAD more clearly

Jeff King committed about 11 years ago

show-ref: place angle brackets around variables in usage string

Alex Henrie committed about 11 years ago

commit: don't rewrite shared index unnecessarily

David Turner committed about 11 years ago

Sync with 2.5.1

Junio C Hamano committed about 11 years ago

Seventh batch for 2.6

Junio C Hamano committed about 11 years ago

Merge branch 'cc/trailers-corner-case-fix'

Junio C Hamano committed about 11 years ago

Merge branch 'dt/untracked-subdir'

Junio C Hamano committed about 11 years ago

git-p4: fix P4 label import for unprocessed commits

Luke Diamand committed about 11 years ago

git-p4: do not terminate creating tag for unknown commit

Luke Diamand committed about 11 years ago