Merge branch 'nd/sparse'

Junio C Hamano committed almost 17 years ago

t7502: test commit.status, --status and --no-status

Junio C Hamano committed almost 17 years ago

grep: rip out pessimization to use fixmatch()

Junio C Hamano committed almost 17 years ago

grep: rip out support for external grep

Junio C Hamano committed almost 17 years ago

commit: support commit.status, --status, and --no-status

James P. Howard, II committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

lockfile: show absolute filename in unable_to_lock_message

Matthieu Moy committed almost 17 years ago

improved rev_is_descendant_of_branch() function

Jakub Suder committed almost 17 years ago

added temporary test dirs to gitignore

Jakub Suder committed almost 17 years ago

added tests for recent changes

Jakub Suder committed almost 17 years ago

Introduce <branch>@{upstream} notation

Johannes Schindelin committed about 17 years ago

fixed bug in commit message for split

Jakub Suder committed almost 17 years ago

changed alias for --prefix from -p to -P

Jakub Suder committed almost 17 years ago

hg-to-git: fix COMMITTER type-o

Bart Trojanowski committed almost 17 years ago

Be more user-friendly when refusing to do something because of conflict.

Matthieu Moy committed almost 17 years ago

Improve error message when a transport helper was not found

Ilari Liusvaara committed almost 17 years ago

remote-curl: Fix Accept header for smart HTTP connections

Shawn O. Pearce committed almost 17 years ago

rebase-i: Ignore comments and blank lines in peek_next_command

Michael Haggerty committed almost 17 years ago

lib-rebase: Allow comments and blank lines to be added to the rebase script

Michael Haggerty committed almost 17 years ago

lib-rebase: Provide clearer debugging info about what the editor did

Michael Haggerty committed almost 17 years ago