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 /Documentation/git-config.txt | |
parent | Merge branch 'jc/maint-diffstat-numstat-context' into maint (diff) | |
parent | pull,rebase: handle GIT_WORK_TREE better (diff) | |
download | tgif-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 'Documentation/git-config.txt')
0 files changed, 0 insertions, 0 deletions