summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-15 11:27:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-15 11:27:41 -0800
commitec82874ad47627a44b6b22a6645551a214293711 (patch)
tree9b3c1121c7f4f69ea0966885f904f18a3e2f39bc /Documentation/merge-strategies.txt
parentrequest-pull.txt: Document -p option (diff)
parentGit 1.6.4.5 (diff)
downloadtgif-ec82874ad47627a44b6b22a6645551a214293711.tar.xz
Git 1.6.5.9
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions