Merge branch 'en/t3433-rebase-stat-dirty-failure'

Junio C Hamano committed over 6 years ago

Merge branch 'en/rebase-backend'

Junio C Hamano committed over 6 years ago

Merge branch 'en/check-ignore'

Junio C Hamano committed over 6 years ago

Merge branch 'jk/object-filter-with-bitmap'

Junio C Hamano committed over 6 years ago

Merge branch 'jk/push-option-doc-markup-fix'

Junio C Hamano committed over 6 years ago

Merge branch 'jk/doc-diff-parallel'

Junio C Hamano committed over 6 years ago

advice: change "setupStreamFailure" to "setUpstreamFailure"

Heba Waly committed over 6 years ago

advice: extract vadvise() from advise()

Heba Waly committed over 6 years ago

show_one_mergetag: print non-parent in hex form.

Harald van Dijk committed over 6 years ago

git-gui: fix error popup when doing blame -> "Show History Context"

Pratyush Yadav committed over 6 years ago

l10n: Update Catalan translation

Jordi Mas committed over 6 years ago

fast-import: add options for rewriting submodules

brian m. carlson committed over 6 years ago

fast-import: add a generic function to iterate over marks

brian m. carlson committed over 6 years ago

fast-import: make find_marks work on any mark set

brian m. carlson committed over 6 years ago

fast-import: add helper function for inserting mark object entries

brian m. carlson committed over 6 years ago

fast-import: permit reading multiple marks files

brian m. carlson committed over 6 years ago

Revert "gpg-interface: prefer check_signature() for GPG verification"

Junio C Hamano committed over 6 years ago

config.mak.dev: re-enable -Wformat-zero-length

Jeff King committed over 6 years ago

rebase-interactive.c: silence format-zero-length warnings

Ralf Thielow committed over 6 years ago

mingw: workaround for hangs when sending STDIN

Alexandr Miloslavskiy committed over 6 years ago