merge: merge unborn index before setting ref

Jeff King committed over 15 years ago

t7607: clean up stray untracked file

Jeff King committed over 15 years ago

t7607: mark known breakage in test 11 as fixed

Jeff King committed over 15 years ago

gitweb: Fix handling of fractional timezones in parse_date

Jakub Narebski committed over 15 years ago

Improve tree_entry_interesting() handling code

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

Convert read_tree{,_recursive} to support struct pathspec

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

Reimplement read_tree_recursive() using tree_entry_interesting()

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

Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'

Junio C Hamano committed over 15 years ago

Merge branch 'ss/git-gui-mergetool'

Pat Thoyts committed over 15 years ago

git-gui: detect the use of MUI langauge packs on Windows

Pat Thoyts committed over 15 years ago

tests: avoid nonportable {foo,bar} glob

Jonathan Nieder committed over 15 years ago

merge: merge with the default upstream branch without argument

Junio C Hamano committed over 15 years ago

merge: match the help text with the documentation

Jared Hance committed over 15 years ago

diffcore-rename: don't consider unmerged path as source

Martin von Zweigbergk committed over 15 years ago

rerere: make sure it works even in a workdir attached to a young repository

Junio C Hamano committed over 15 years ago

doc: technical details about the index file format

Junio C Hamano committed over 15 years ago

Merge branch 'kc/gitweb-pathinfo-w-anchor'

Junio C Hamano committed over 15 years ago

Merge branch 'jn/fortify-source-workaround'

Junio C Hamano committed over 15 years ago

Merge branch 'jn/maint-c99-format'

Junio C Hamano committed over 15 years ago

Merge branch 'lt/default-abbrev'

Junio C Hamano committed over 15 years ago