summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-11 11:35:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-11 11:35:22 -0700
commit0083f1d43a7280aefa23656eaac7266139484b24 (patch)
tree6689832fb25b753e1328ca7f8eea5e6d9089b06d /Documentation/git-merge-one-file.txt
parentMerge branch 'jc/maint-ident-missing-human-name' (diff)
parenti18n: mark more index-pack strings for translation (diff)
downloadtgif-0083f1d43a7280aefa23656eaac7266139484b24.tar.xz
Merge branch 'nd/i18n-index-pack'
* nd/i18n-index-pack: i18n: mark more index-pack strings for translation
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions