diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-23 19:14:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-23 19:14:13 -0800 |
| commit | d43c07b8ee6684a0df8636a0c849605f0ffc066f (patch) | |
| tree | c449f4363cd3daad2a03712dd19d3ee94e038553 /builtin-merge-ours.c | |
| parent | b4b0ba06f8748348039d56ffa5890590dd9776ee (diff) | |
| parent | 0df84059d4127ed06e040998ec0e6ce6f61d3d1f (diff) | |
| download | git-d43c07b8ee6684a0df8636a0c849605f0ffc066f.tar.gz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
git-svn: read the dcommit url from the config file on a per remote basis
git-svn: fix delete+add branch tracking with empty files
git-svn: Create leading directories in create-ignore
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions