![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Oct 2011 04:37:14 +0000 (21:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Oct 2011 04:37:14 +0000 (21:37 -0700) | ||
| commit | f2b516352527c6ddf338143e4ade0ef4713f85eb | |
| tree | 1876df9a5d1726ef3182b0b11c8aa943fb12302a | tree | snapshot |
| parent | 0c762702a061c57f1482cc7405989b9373165e40 | commit | diff |
| parent | 035b5bf6431dbf8f3cde2f44b0d7ef893b95b605 | commit | diff |
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
* jk/pull-rebase-with-work-tree:
pull,rebase: handle GIT_WORK_TREE better
Conflicts:
git-pull.sh
| git-pull.sh | diff1 | | diff2 | | blob | history |
| git-rebase.sh | diff1 | | diff2 | | blob | history |