The fourth batch

Junio C Hamano committed over 4 years ago

Merge branch 'js/scalar'

Junio C Hamano committed over 4 years ago

Merge branch 'ld/sparse-diff-blame'

Junio C Hamano committed over 4 years ago

Merge branch 'en/name-rev-shorter-output'

Junio C Hamano committed over 4 years ago

Merge branch 'ak/protect-any-current-branch'

Junio C Hamano committed over 4 years ago

Merge branch 'fs/ssh-signing-other-keytypes'

Junio C Hamano committed over 4 years ago

Merge branch 'fs/ssh-signing-key-lifetime'

Junio C Hamano committed over 4 years ago

Merge branch 'jc/grep-patterntype-default-doc'

Junio C Hamano committed over 4 years ago

Merge branch 'jk/log-decorate-opts-with-implicit-decorate'

Junio C Hamano committed over 4 years ago

Merge branch 'en/rebase-x-wo-git-dir-env'

Junio C Hamano committed over 4 years ago

Merge branch 'jc/c99-var-decl-in-for-loop'

Junio C Hamano committed over 4 years ago

Merge branch 'pw/xdiff-classify-record-in-histogram'

Junio C Hamano committed over 4 years ago

l10n: README: call more attention to plural strings

Josh Steadmon committed over 4 years ago

fast-export: fix surprising behavior with --first-parent

William Sprent committed over 4 years ago

config: require lowercase for branch.*.autosetupmerge

Josh Steadmon committed over 4 years ago

branch: add flags and config to inherit tracking

Josh Steadmon committed over 4 years ago

branch: accept multiple upstream branches for tracking

Josh Steadmon committed over 4 years ago

merge: allow to pretend a merge is made into a different branch

Junio C Hamano committed over 4 years ago

git-p4: show progress as an integer

Joel Holdsworth committed over 4 years ago

git-p4: print size values in appropriate units

Joel Holdsworth committed over 4 years ago