diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:03:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:03:03 -0700 |
| commit | a8b31316ef90153f148b685a802195885d5195f4 (patch) | |
| tree | bd98cb4fb6c37f604b5d137669e8a5787632fdbb /builtin/merge-file.c | |
| parent | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint (diff) | |
| parent | check-attr: move to the top of working tree when in non-bare repository (diff) | |
| download | tgif-a8b31316ef90153f148b685a802195885d5195f4.tar.xz | |
Merge branch 'jc/check-attr-honor-working-tree' into maint
"git check-attr" when working on a repository with a working tree
did not work well when the working tree was specified via the
--work-tree (and obviously with --git-dir) option.
* jc/check-attr-honor-working-tree:
check-attr: move to the top of working tree when in non-bare repository
t0003: do not chdir the whole test process
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions