diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-01 16:11:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-01 16:11:00 -0700 |
| commit | 0814d6e554c45636f41856cc2204abe2f661560c (patch) | |
| tree | 944fb8c2fdbd40dcef36a1175b4fc097ecddd8f2 /compat/regex/regex.h | |
| parent | eee947fb95dfa160d924824518dbfcb350c10aa5 (diff) | |
| parent | 035b5bf6431dbf8f3cde2f44b0d7ef893b95b605 (diff) | |
| download | git-0814d6e554c45636f41856cc2204abe2f661560c.tar.gz git-0814d6e554c45636f41856cc2204abe2f661560c.tar.xz | |
Merge branch 'jk/pull-rebase-with-work-tree' into maint
* jk/pull-rebase-with-work-tree:
pull,rebase: handle GIT_WORK_TREE better
Conflicts:
git-pull.sh
Diffstat (limited to 'compat/regex/regex.h')
0 files changed, 0 insertions, 0 deletions