Merge branch 'jc/apply'
commitb32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd
authorJunio C Hamano <junkio@cox.net>
Mon, 28 Aug 2006 00:51:05 +0000 (27 17:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 28 Aug 2006 00:51:05 +0000 (27 17:51 -0700)
treeea8f2b5b30822c350cd9b5e6428d86ee53c706f8
parent2e6183840e5c8f1a478975346549be7440405175
parent8938045a4eae7a9c39631508a3c3d34c50c6257a
Merge branch 'jc/apply'

* jc/apply:
  git-apply --reject: finishing touches.
  apply --reject: count hunks starting from 1, not 0
  git-apply --verbose
  git-apply --reject: send rejects to .rej files.
  git-apply --reject
  apply --reverse: tie it all together.
  diff.c: make binary patch reversible.
  builtin-apply --reverse: two bugfixes.
Documentation/git-apply.txt
builtin-apply.c
diff.c