projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1c66693) | patch
Build in merge
authorMiklos Vajna <vmiklos@frugalware.org>
Mon, 7 Jul 2008 17:24:20 +0000 (19:24 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jul 2008 00:50:01 +0000 (17:50 -0700)
commit1c7b76be7d620bbaf2e6b8417f04012326bbb9df
tree1245fa311746c7d0c0ec78a7d773a57edb5460a5tree | snapshot
parent1c6669351a47c834cceb75d6044a1aae259fc69fcommit | diff
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>
Makefile diff | blob | history
builtin-merge.c [new file with mode: 0644] blob
builtin.h diff | blob | history
contrib/examples/git-merge.sh [moved from git-merge.sh with 100% similarity] blob | history
git.c diff | blob | history
t/t7602-merge-octopus-many.sh diff | blob | history
Git—the stupid content tracker