Fix combined use of whitespace ignore options to diff

Keith Cascio committed almost 18 years ago

Merge branch 'kc/maint-diff-bwi-fix'

Junio C Hamano committed almost 18 years ago

test more combinations of ignore-whitespace options to diff

Keith Cascio committed almost 18 years ago

Merge branch 'maint'

Junio C Hamano committed almost 18 years ago

shell: Document that 'cvs server' is a valid command

Lars Noschinski committed almost 18 years ago

Fix reflog parsing for a malformed branch switching entry

Junio C Hamano committed almost 18 years ago

Fix parsing of @{-1}@{1}

Johannes Schindelin committed almost 18 years ago

interpret_nth_last_branch(): avoid traversing the reflog twice

Junio C Hamano committed almost 18 years ago

bash completion: refactor diff options

Thomas Rast committed almost 18 years ago

bash completion: move pickaxe options to log

Thomas Rast committed almost 18 years ago

difftool: put the cursor on the editable file for Vim

David Aguilar committed almost 18 years ago

difftool: fix documentation problems

David Aguilar committed almost 18 years ago

Merge git://git.bogomips.org/git-svn

Junio C Hamano committed almost 18 years ago

git-svn: Show UUID in svn info for added directories with svn 1.5.5

Marcel Koeppen committed almost 18 years ago

git-am: re-fix the diag message printing

Junio C Hamano committed almost 18 years ago

git-svn: avoid importing nested git repos

Eric Wong committed almost 18 years ago

git-svn: fix SVN 1.1.x compatibility

Eric Wong committed almost 18 years ago

git-svn: Add --localtime option to "fetch"

Pete Harlan committed almost 18 years ago

git-svn: better attempt to handle broken symlink updates

Eric Wong committed almost 18 years ago

git-svn: handle empty files marked as symlinks in SVN

Eric Wong committed almost 18 years ago