summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2010-04-11 22:40:12 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-11 13:48:46 -0700
commitf9a2743c3529baab6de650aa3e3eb96de9386fec (patch)
treec639acad982fb1fb3fa1f80915b6944361421a46 /Documentation/git-merge.txt
parentTeach diff --submodule and status to handle .git files in submodules (diff)
downloadtgif-f9a2743c3529baab6de650aa3e3eb96de9386fec.tar.xz
Windows: start_command: Support non-NULL dir in struct child_process
A caller of start_command can set the member 'dir' to a directory to request that the child process starts with that directory as CWD. The first user of this feature was added recently in eee49b6 (Teach diff --submodule and status to handle .git files in submodules). On Windows, we have been lazy and had not implemented support for this feature, yet. This fixes the shortcoming. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions