Merge branch 'ls/p4-path-encoding'

Junio C Hamano committed over 9 years ago

tempfile: avoid "ferror | fclose" trick

Jeff King committed over 9 years ago

config.txt: fix formatting of submodule.alternateErrorStrategy section

David Pursehouse committed over 9 years ago

clean: use warning_errno() when appropriate

Nguyễn Thái Ngọc Duy committed over 9 years ago

reset: add an example of how to split a commit into two

Jacob Keller committed over 9 years ago

Revert "reset: add an example of how to split a commit into two"

Junio C Hamano committed over 9 years ago

bisect_next_all: convert xsnprintf to xstrfmt

Maxim Moseychuk committed over 9 years ago

stop_progress_msg: convert xsnprintf to xstrfmt

Maxim Moseychuk committed over 9 years ago

l10n: update Catalan translation

Jordi Mas committed over 9 years ago

A bit more for -rc2

Junio C Hamano committed over 9 years ago

Merge branch 'tg/stash-doc-cleanup'

Junio C Hamano committed over 9 years ago

Merge branch 'jk/doc-submodule-markup-fix'

Junio C Hamano committed over 9 years ago

Merge branch 'jk/doc-remote-helpers-markup-fix'

Junio C Hamano committed over 9 years ago

show-branch: use skip_prefix to drop magic numbers

Jeff King committed over 9 years ago

Merge branch 'sb/doc-unify-bottom'

Junio C Hamano committed over 9 years ago

Merge branch 'sb/push-options-via-transport'

Junio C Hamano committed over 9 years ago

Merge branch 'cw/completion'

Junio C Hamano committed over 9 years ago

Merge branch 'rs/swap'

Junio C Hamano committed over 9 years ago

Merge branch 'sb/submodule-doc'

Junio C Hamano committed over 9 years ago

grep: treat revs the same for --untracked as for --no-index

Jeff King committed over 9 years ago