global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 10:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/c-merge-recursive' into next

Browse Source 
* js/c-merge-recursive:
  Makefile: git-merge-recur depends on xdiff libraries.
  merge-recur: Explain why sha_eq() and struct stage_data cannot go
  merge-recur: Cleanup last mixedCase variables...
  merge-recur: Fix compiler warning with -pedantic
  merge-recur: Remove dead code
  merge-recur: Get rid of debug code
  merge-recur: Convert variable names to lower_case
  Cumulative update of merge-recursive in C
This commit is contained in:
Junio C Hamano
2006-07-27 22:03:07 -07:00
parent ff072671df a060b803b4
commit 0b75751464
2 changed files with 505 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -670,7 +670,7 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
merge-recursive.o path-list.o: path-list.h
git-merge-recur$X: merge-recursive.o path-list.o $(LIB_FILE)
git-merge-recur$X: merge-recursive.o path-list.o $(GITLIBS)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS)

1255
merge-recursive.c
View File

File diff suppressed because it is too large Load Diff