summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorLibravatar Jari Aalto <jari.aalto@cante.net>2010-12-03 10:20:54 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-03 11:16:45 -0800
commitc4f4157ee84ff27dd7a398f80002be59eb2f69e7 (patch)
tree6773d1e0f9baa7b639c9e1c75410394c4194a1b8 /git.c
parentPrepare for 1.7.3.3 (diff)
downloadtgif-c4f4157ee84ff27dd7a398f80002be59eb2f69e7.tar.xz
git-pull.txt: Mention branch.autosetuprebase
In "Options related to merging" mention also related option branch.autosetuprebase in git-config(1). Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions