diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-18 08:37:14 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-18 08:37:14 +0400 |
| commit | f2b516352527c6ddf338143e4ade0ef4713f85eb (patch) | |
| tree | 1876df9a5d1726ef3182b0b11c8aa943fb12302a /resolve-undo.h | |
| parent | 0c762702a061c57f1482cc7405989b9373165e40 (diff) | |
| parent | 035b5bf6431dbf8f3cde2f44b0d7ef893b95b605 (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
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions