diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-26 00:22:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-26 00:22:48 -0800 |
| commit | 692c7fc9cb81a2f68b23199d5b8612494fe4d317 (patch) | |
| tree | a0276f87f0e29ca932f71119cc7ffb72fb210fbd /fetch-pack.c | |
| parent | Merge git://git.kernel.org/pub/scm/gitk/gitk (diff) | |
| parent | git-merge knows some strategies want to skip trivial merges (diff) | |
| download | git-692c7fc9cb81a2f68b23199d5b8612494fe4d317.tar.gz git-692c7fc9cb81a2f68b23199d5b8612494fe4d317.zip | |
Merge branch 'jc/merge'
* jc/merge:
git-merge knows some strategies want to skip trivial merges
Diffstat (limited to 'fetch-pack.c')
0 files changed, 0 insertions, 0 deletions