threads / discuss / 4545

Post 1.4.0 merge status

Subject: Post 1.4.0 merge status

## tl;dr

One message between Jun 17, 2006 and Jun 17, 2006.

replies: 0people: 1as markdown or json

Junio C Hamano· Jun 17, 2006, 21:38 UTC · lore
I thank everybody who submitted patches while I was away.  

I'm trying to catch up with you and have merged the following so far to "master". Will push them out shortly after I review them for the last time, hopefully sometime today:

 - pulled git-svn updates from Eric Wong (I first applied the
   patches from the list to a test branch, and compared it with
   the result of the pull onto the master -- they match, so I
   decided to take the pull result).
 - pulled gitk from Paul to fix "Re-read references".
 - git whatchanged to show full-history from Linus.
 - Portability of t4101 test for diff implementations that do
   not do "\No newline..." from Dennis Stosberg.
 - mailinfo fix from Eric W Biederman not to confuse "From: "
   lines in the middle of log message as an in-body header.
 - gitweb 'blame' that can be switched on/off from Florian
   Foster.
 - gitweb README update from Jakub.
 - git-blame updates to add -time from Fredrik.
 - three patches to cvsimport from Martin.
 - strlcpy from Peter Eriksen.
 - a p4import update from Sean.
 - cvsexportcommit typofix  from Sven Verdoolaege.
I'll be looking at these after the above;
 - 2 patches to diff (color and -b/w) from Johannes.
 - avoiding "make prefix=A ; make prefix=B install" confusion
   from Yakov.
I've queued the following to look at in the next round;
 - format-patch -s fix from Eric W Biederman;
 - 7+1 patches to make am and commands required for it built-in
   from Lukas.
 - raw-blob output from gitweb by Jakub.
 - big "SHA1"->"SHA-1" and other documentation updates from
   Horst; I was hoping to merge this while flying over Pacific,
   but I seemed to have duplicates and was too tired and fell
   asleep.

← back to recent threads