| commit | 2c36f6aea66435aa551d2a04127026241f13b19e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 31 Mar 2011 20:13:58 +0000 (31 13:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 31 Mar 2011 20:13:58 +0000 (31 13:13 -0700) | ||
| tree | 8ab45372ddb2e0c6d388e28cb5a0cf027d4c7527 | treesnapshot (tar.gz zip) |
| parent | 66cbb7d17e1845c050f9cc9dca6dda4412a88c4c | commitdiff |
| parent | b892913d51795ee66d825bedd23e5c4ffe85ebb2 | commitdiff |
Merge branch 'nd/maint-setup' into next
* nd/maint-setup:
Kill off get_relative_cwd()
setup: return correct prefix if worktree is '/'
Conflicts:
dir.c
setup.c
* nd/maint-setup:
Kill off get_relative_cwd()
setup: return correct prefix if worktree is '/'
Conflicts:
dir.c
setup.c
| dir.c | diff1 | diff2 | blobhistory |
| dir.h | diff1 | diff2 | blobhistory |
| setup.c | diff1 | diff2 | blobhistory |