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

10 KiB

Executable File

Raw Blame History

View Raw