Merge branch 'jk/diff-filespec-cleanup'

Junio C Hamano committed over 12 years ago

Merge branch 'jk/clean-d-pathspec'

Junio C Hamano committed over 12 years ago

add: use struct argv_array in run_add_interactive()

Fabian Ruch committed over 12 years ago

test-lib.sh: do not "echo" caller-supplied strings

Uwe Storbeck committed over 12 years ago

run-command: mark run_hook_with_custom_index as deprecated

Benoit Pierre committed over 12 years ago

merge hook tests: fix and update tests

Benoit Pierre committed over 12 years ago

merge: fix GIT_EDITOR override for commit hook

Benoit Pierre committed over 12 years ago

commit: fix patch hunk editing with "commit -p -m"

Benoit Pierre committed over 12 years ago

test patch hunk editing with "commit -p -m"

Benoit Pierre committed over 12 years ago

subtree: initialize "prefix" variable

Jeff King committed over 12 years ago

Documentation/merge-strategies: avoid hyphenated commands

Ramkumar Ramachandra committed over 12 years ago

index-pack: report error using the correct variable

Junio C Hamano committed over 12 years ago

Documentation/git-am: typofix

Chris Packham committed over 12 years ago

shallow: verify shallow file after taking lock

Jeff King committed over 12 years ago

pack-objects: turn off bitmaps when skipping objects

Jeff King committed over 12 years ago

pack-objects: show reused packfile objects in "Counting objects"

Jeff King committed over 12 years ago

pack-objects: show progress for reused packfiles

Jeff King committed over 12 years ago

rebase -i: do not "echo" random user-supplied strings

Uwe Storbeck committed over 12 years ago

mv: prevent mismatched data when ignoring errors.

brian m. carlson committed over 12 years ago

t/lib-terminal: make TTY a lazy prerequisite

Jeff King committed over 12 years ago