summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-08-02 19:22:28 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-08-03 20:37:19 +0100
commitf871bade5ee513f8367ebb35a843778df61eaed2 (patch)
treef20a4ce1538ff80eca358b24c2928d3f10137df7 /dgit-maint-merge.7.pod
parent8a6027965b4f02552cf754f9ec081e35c7174146 (diff)
worktree support: dgit: Fix for .git/info/attributes
Experimentally, this file is in the common dir, not the per-worktree dir. Honour $maindir_gitcommon everywhere. Rename `open_main_gitattrs'. Previously it could in theory be used in the playtree (but, it isn't). Now it always operates on the main tree. Indeed, as we require, the `setup' stuff is only done in the main tree. The gitattributes fixes for playtrees are done, unconditionally, with the much simpler hammer in playtree_setup. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit-maint-merge.7.pod')
0 files changed, 0 insertions, 0 deletions