projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4003a58 49ed2bc)
Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 18:47:37 +0000 (10:47 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 18:47:37 +0000 (10:47 -0800)
* maint:
  git-reset to remove "$GIT_DIR/MERGE_MSG"
  unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.


Trivial merge
Git—the stupid content tracker