Merge branch 'master' into next

Browse Source

* master:
  git-diff -B output fix.
  Fix git-am safety checks
  Fix duplicate xmalloc in builtin-add

...

This commit is contained in:

Junio C Hamano

2006-10-01 02:20:46 -07:00

parent c9fffedbbf 284fe4beb6

commit 91c5908e90

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available