mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00
Code Activity
14929 commits 6 branches 956 tags 469 MiB
Commit graph

2 commits

Author SHA1 Message Date
Junio C Hamano
4393c23741 Teach merge.log to "git-merge" again 
The command forgot the configuration variable when rewritten in C.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-07-10 01:05:47 -07:00
Miklos Vajna
1c7b76be7d Build in merge 
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-07-07 17:50:01 -07:00