projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ced057 2f6dc35)
Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Mon, 5 Mar 2007 17:49:02 +0000 (12:49 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 5 Mar 2007 17:50:29 +0000 (12:50 -0500)
commit6b4318e604ca729d5d7508a744f0155555094fae
treeb8b65b5963737f9cd6663fc49fc6f902768b648atree | snapshot
parent5ced0572217f82f20c4a3460492768e07c08aeeacommit | diff
parent2f6dc35d2ad0bd2a8648902a692f087f47d1ee86commit | diff
Merge branch 'maint'

* maint:
  fast-import: Fail if a non-existant commit is used for merge
  fast-import: Avoid infinite loop after reset

[sp: Minor evil merge to deal with type_names array moving
 to be private in 'master'.]
fast-import.c diff1 | diff2 | blob | history
Git—the stupid content tracker