diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-17 00:12:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-17 00:12:18 (GMT) |
| commit | e75bf76f5462af4185d8260f6feecf24dd24a516 (patch) | |
| tree | f079b41f350ea291f968ad531298053212c15922 /contrib/examples/git-merge.sh | |
| parent | 1c7ac06dc612c469d74be6be8164465d65a7829a (diff) | |
| parent | 489e351ea03e78746bad0c0ad4fcf4a63920256d (diff) | |
| download | git-e75bf76f5462af4185d8260f6feecf24dd24a516.zip git-e75bf76f5462af4185d8260f6feecf24dd24a516.tar.gz git-e75bf76f5462af4185d8260f6feecf24dd24a516.tar.bz2 | |
Merge branch 'rs/archive'
* 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
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions