summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-10-10 23:00:29 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-10-10 23:00:29 -0700
commita057f806674f691f1640d33df14de8de8a3d4c87 (patch)
tree23ca435fd511865b4b7d1120ad006523e207bd25 /Documentation/merge-strategies.txt
parentgit-fetch --update-head-ok typofix (diff)
downloadtgif-a057f806674f691f1640d33df14de8de8a3d4c87.tar.xz
git-pull: we say commit X, not X commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions