submodule update: allow custom command to update submodule working tree

Chris Packham committed over 13 years ago

merge: handle --ff/--no-ff/--ff-only as a tri-state option

Miklos Vajna committed over 13 years ago

Do not ignore merge options in interactive rebase

Arnaud Fontaine committed over 13 years ago

fetch-pack: avoid quadratic behavior in rev_list_push

Jeff King committed over 13 years ago

commit.c: make compare_commits_by_commit_date global

Jeff King committed over 13 years ago

fetch-pack: avoid quadratic list insertion in mark_complete

Jeff King committed over 13 years ago

get_short_sha1(): correctly disambiguate type-limited abbreviation

Junio C Hamano committed over 13 years ago

t1512: correct leftover constants from earlier edition

Junio C Hamano committed over 13 years ago

git stash: avoid data loss when "git stash save" kills a directory

Petr Baudis committed over 13 years ago

treat_directory(): do not declare submodules to be untracked

Junio C Hamano committed over 13 years ago

Merge branch 'maint'

Junio C Hamano committed over 13 years ago

Update draft release notes to 1.8.4

Junio C Hamano committed over 13 years ago

Merge branch 'rr/remote-branch-config-refresh'

Junio C Hamano committed over 13 years ago

Merge branch 'ed/color-prompt'

Junio C Hamano committed over 13 years ago

Merge branch 'ap/rebase-multiple-fixups'

Junio C Hamano committed over 13 years ago

Merge branch 'kb/am-deprecate-resolved'

Junio C Hamano committed over 13 years ago

Merge branch 'rr/column-doc'

Junio C Hamano committed over 13 years ago

Merge branch 'ft/doc-git-transport'

Junio C Hamano committed over 13 years ago

Merge branch 'sb/mailmap-merijn-brand'

Junio C Hamano committed over 13 years ago

Merge branch 'sg/bash-prompt'

Junio C Hamano committed over 13 years ago