projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: abc0267 9fdc3bb)
Merge branch 'js/patch'
authorJunio C Hamano <junkio@cox.net>
Thu, 29 Jun 2006 06:42:40 +0000 (23:42 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 29 Jun 2006 06:42:40 +0000 (23:42 -0700)
commitf38c2a9c9982950109d0eb0802b9713dfffeb18b
tree4a6eaddf3b13001890946291b595255a13f403e6tree | snapshot
parentabc02670169cee9541793a86324a014272ca8ed5commit | diff
parent9fdc3bb5c20e37e410e03ed5b6c71a7e647ccee8commit | diff
Merge branch 'js/patch'

* js/patch:
  diff.c: fix get_patch_id()
  t4014: fix test commit labels.
  format-patch: use clear_commit_marks() instead of some ad-hockery
  t4014: fix for whitespace from "wc -l"
  t4014: add format-patch --ignore-if-in-upstream test
  format-patch: introduce "--ignore-if-in-upstream"
  add diff_flush_patch_id() to calculate the patch id
Git—the stupid content tracker