summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorLibravatar Jan Krüger <jk@jk.gs>2009-11-27 08:17:05 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-03 10:04:27 -0800
commit995fc2f7e17fab8dd59f31f25870a0823cdb6f27 (patch)
treeef66f2f04326e71b8eeddf79409046ee826a0bcc /configure.ac
parentmerge: do not add standard message when message is given with -m option (diff)
downloadtgif-995fc2f7e17fab8dd59f31f25870a0823cdb6f27.tar.xz
pull: clarify advice for the unconfigured error case
When pull --rebase fails because it cannot find what branch to merge against, the error message implies we are trying to merge. Say "rebase against" instead of "merge with" to avoid confusion. The configuration suggested to remedy the situation uses a confusing syntax, with variables specified in the dotted form accepted by 'git config' but separated from their values by the '=' delimiter used by config files. Since the user will have to edit this output anyway, it is more helpful to provide a config file snippet to paste into an editor and modify. Signed-off-by: Jan Krüger <jk@jk.gs> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions