diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:14 -0700 |
commit | f2b516352527c6ddf338143e4ade0ef4713f85eb (patch) | |
tree | 1876df9a5d1726ef3182b0b11c8aa943fb12302a /symlinks.c | |
parent | Merge branch 'jk/config-test-cleanup' (diff) | |
parent | pull,rebase: handle GIT_WORK_TREE better (diff) | |
download | tgif-f2b516352527c6ddf338143e4ade0ef4713f85eb.tar.xz |
Merge branch 'jk/pull-rebase-with-work-tree'
* jk/pull-rebase-with-work-tree:
pull,rebase: handle GIT_WORK_TREE better
Conflicts:
git-pull.sh
Diffstat (limited to 'symlinks.c')
0 files changed, 0 insertions, 0 deletions