Junio C Hamano 85bac95e5f Merge branch 'js/diff-b' into next ...

* js/diff-b:
  Document git-diff whitespace flags -b and -w
  diff -b: ignore whitespace at end of line
  receive-pack: do not insist on fast-forward outside refs/heads/
  git-fetch: ignore dereferenced tags in expand_refs_wildcard
  git-clone: Rename --use-immingled-remote option to --no-separate-remote
  gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url
  Make perl/ build procedure ActiveState friendly.
  Pass -M to diff in request-pull
  Set permissions of each new file before "cvs add"ing it.
  git-mv: search more precisely for source directory in index

Conflicts:

	git-clone.sh

2006-12-04 16:33:22 -08:00

..

xdiff.h

xdiff: add xdl_merge()

2006-12-02 17:28:19 -08:00

xdiffi.c

xdiff: add xdl_merge()

2006-12-02 17:28:19 -08:00

xdiffi.h

xdiff: add xdl_merge()

2006-12-02 17:28:19 -08:00

xemit.c

Increase length of function name buffer

2006-11-23 22:51:41 -08:00

xemit.h

Use a *real* built-in diff generator

2006-03-25 16:49:58 -08:00

xinclude.h

xdiff: Show function names in hunk headers.

2006-03-27 18:43:51 -08:00

xmacros.h

Fix hash function in xdiff library

2006-10-16 21:27:44 -07:00

xmerge.c

xdl_merge(): fix thinko

2006-12-02 17:28:19 -08:00

xprepare.c

Teach diff about -b and -w flags

2006-06-23 17:35:27 -07:00

xprepare.h

Use a *real* built-in diff generator

2006-03-25 16:49:58 -08:00

xtypes.h

Use a *real* built-in diff generator

2006-03-25 16:49:58 -08:00

xutils.c

diff -b: ignore whitespace at end of line

2006-12-04 16:30:54 -08:00

xutils.h

Teach diff about -b and -w flags

2006-06-23 17:35:27 -07:00