]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 110cb41 c3b831b d9ea73e)
Merge branches 'master' and 'jc/combine' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 09:58:14 +0000 (02:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 09:58:14 +0000 (02:58 -0700)
commitb4196cf70a5fcd659fe334e5c03a416383f41985
tree82a8366ad6c2fd014caa3626ba0dd4f713226cfftree | snapshot
parent110cb41cbf7b7cfefdc1f9fab521f165dd1d5d00commit | diff
parentc3b831bd84320374834f9984c118cb4fc7050ebccommit | diff
parentd9ea73e0564c7db8d791fe6b03c976ce57c9b079commit | diff
Merge branches 'master' and 'jc/combine' into next

* master:
  Add git-clean command
  diff_flush(): leakfix.
  parse_date(): fix parsing 03/10/2006

* jc/combine:
  combine-diff: refactor built-in xdiff interface.
Makefile diff1 | diff2 | diff3 | blob | history
diff.c diff1 | diff2 | diff3 | blob | history
Unnamed repository; edit this file 'description' to name the repository.