]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c7ac06 489e351)
Merge branch 'rs/archive'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2008 00:12:18 +0000 (17:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2008 00:12:18 +0000 (17:12 -0700)
* rs/archive:
  archive: remove extra arguments parsing code
  archive: unify file attribute handling
  archive: centralize archive entry writing
  archive: add baselen member to struct archiver_args
  add context pointer to read_tree_recursive()
  archive: remove args member from struct archiver

1  2 
builtin-merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc builtin-merge-recursive.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.