Merge branch 'jk/drop-unaligned-loads'

Junio C Hamano committed almost 6 years ago

Merge branch 'js/no-builtins-on-disk-option'

Junio C Hamano committed almost 6 years ago

Merge branch 'ab/mediawiki-fixes'

Junio C Hamano committed almost 6 years ago

credential: treat CR/LF as line endings in the credential protocol

Nikita Leonov committed almost 6 years ago

Merge remote-tracking branch 'paulus/master' into pm/gitk-update

Junio C Hamano committed almost 6 years ago

t, doc: update tests, reference for "--force-if-includes"

Srinidhi Kaushik committed almost 6 years ago

push: parse and set flag for "--force-if-includes"

Srinidhi Kaushik committed almost 6 years ago

push: add reflog check for "--force-if-includes"

Srinidhi Kaushik committed almost 6 years ago

gitk: Resize panes correctly when reducing window size

Paul Mackerras committed almost 6 years ago

gitk: replace tabs with spaces

Denton Liu committed almost 6 years ago

Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes

Junio C Hamano committed almost 6 years ago

commit-reach: fix in_merge_bases_many bug

Derrick Stolee committed almost 6 years ago

format-patch: teach format.useAutoBase "whenAble" option

Jacob Keller committed almost 6 years ago

submodule update: silence underlying merge/rebase with "--quiet"

Theodore Dubois committed almost 6 years ago

clone: allow configurable default for `-o`/`--origin`

Sean Barag committed almost 6 years ago

clone: read new remote name from remote_name instead of option_origin

Sean Barag committed almost 6 years ago

clone: validate --origin option before use

Sean Barag committed almost 6 years ago

refs: consolidate remote name validation

Sean Barag committed almost 6 years ago

remote: add tests for add and rename with invalid names

Sean Barag committed almost 6 years ago

clone: use more conventional config/option layering

Sean Barag committed almost 6 years ago