Merge branch 'jc/merge-tag-object'

Junio C Hamano committed over 13 years ago

path.c: optimize adjust_shared_perm()

Torsten Bögershausen committed over 13 years ago

path.c: simplify adjust_shared_perm()

Torsten Bögershausen committed over 13 years ago

submodule: print graph output next to submodule log

John Keeping committed over 13 years ago

diff: allow unstuck arguments with --diff-algorithm

John Keeping committed over 13 years ago

git-merge(1): document diff-algorithm option to merge-recursive

John Keeping committed over 13 years ago

glossary: extend "detached HEAD" description

Junio C Hamano committed over 13 years ago

log -L: fix overlapping input ranges

Thomas Rast committed over 13 years ago

log -L: check range set invariants when we look it up

Thomas Rast committed over 13 years ago

diffcore-pickaxe: unify code for log -S/-G

Jeff King committed over 13 years ago

diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"

Junio C Hamano committed over 13 years ago

diffcore-pickaxe: port optimization from has_changes() to diff_grep()

Junio C Hamano committed over 13 years ago

diffcore-pickaxe: respect --no-textconv

Simon Ruderich committed over 13 years ago

Documentation/git-commit: reword the --amend explanation

Carlos Martín Nieto committed over 13 years ago

t3600: document failure of rm across symbolic links

Jeff King committed over 13 years ago

diffcore-pickaxe: remove fill_one()

Jeff King committed over 13 years ago

diffcore-pickaxe: remove unnecessary call to get_textconv()

Simon Ruderich committed over 13 years ago

t9700: do not close STDERR

Thomas Rast committed over 13 years ago

perl: redirect stderr to /dev/null instead of closing

Thomas Rast committed over 13 years ago

Sync with maint

Junio C Hamano committed over 13 years ago