Merge branch 'jc/mktree' into sb/opt-filename

Junio C Hamano committed over 17 years ago

Merge branch 'sb/format-patch-parseopt' into sb/opt-filename

Junio C Hamano committed over 17 years ago

Merge branch 'sb/show-branch-parse-options' into sb/opt-filename

Junio C Hamano committed over 17 years ago

Merge branch 'master' into sb/opt-filename

Junio C Hamano committed over 17 years ago

Change xdl_merge to generate output even for null merges

Charles Bailey committed over 17 years ago

t6023: merge-file fails to output anything for a degenerate merge

Charles Bailey committed over 17 years ago

gitk: Allow diff view without context lines

Markus Heidelberg committed over 17 years ago

gitk: Add another string to translation

Michele Ballabio committed over 17 years ago

gitk: Add option 'Simple history' to the options menu

Dirk Suesserott committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.2' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.1' into maint-1.6.2

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed over 17 years ago

apply: handle filenames with double slashes better

Michal Marek committed over 17 years ago

More to-do items based on feedback

Avery Pennarun committed over 17 years ago

mergetool--lib: add support for araxis merge

David Aguilar committed over 17 years ago

http-push.c::remove_locks(): fix use after free

Alex Riesen committed over 17 years ago

t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C

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

grep: fix word-regexp at the beginning of lines

René Scharfe committed over 17 years ago

apply, fmt-merge-msg: use relative filenames

Stephen Boyd committed over 17 years ago