]> git.ipfire.org Git - thirdparty/git.git/commit - builtin-merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bf6d324) | patch
Cumulative update of merge-recursive in C
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Thu, 27 Jul 2006 11:17:07 +0000 (13:17 +0200)
committerJunio C Hamano <junkio@cox.net>
Fri, 28 Jul 2006 02:39:15 +0000 (19:39 -0700)
commit3af244caa8297793f29d7422bb19d9da1bf07b5e
tree7d56c29d85aee779e659c2cf767008a3ff20e417tree | snapshot
parentbf6d324e7333f62f6aee56ebb886e82e1f49e1cecommit | diff
Cumulative update of merge-recursive in C

This contains mainly three sorts of fixes:

- get rid of small wrapper functions
- reuse the diff_filespec structure when sha1, mode & path are needed
- Junio's pedantic updates

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.