summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2011-09-01 18:49:37 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-09-01 15:51:48 -0700
commit960e3114963dbb290c12f7a4d19c5776584d43ff (patch)
treee2bed2cbd31786075fb3ee87d530a1f4a6174fee /mergetools/p4merge
parentDocumentation/remote-helpers: explain capabilities first (diff)
downloadtgif-960e3114963dbb290c12f7a4d19c5776584d43ff.tar.xz
Documentation/git-remote-helpers: explain how import works with multiple refs
This is important for two reasons: * when two "import" lines follow each other, only one "done" command should be issued in the fast-import stream, not one per "import". * The blank line terminating an import command should not be confused with the one terminating the sequence of commands. While we're there, illustrate the corresponding explanation for push batches with an example. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions