summaryrefslogtreecommitdiff
path: root/Documentation/git-receive-pack.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:12:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:12:25 (GMT)
commit87d99c64dfa8880592104245896557aa530d4fd9 (patch)
treebaf019f2b0272eb4a6033d9f1c78f0f80be9d665 /Documentation/git-receive-pack.txt
parent716b64a73e65d7494dfb37631292fcbe8cb34cc0 (diff)
parent6d9990a959c0168ab6dfe75236980f95ac512ce5 (diff)
downloadgit-87d99c64dfa8880592104245896557aa530d4fd9.zip
git-87d99c64dfa8880592104245896557aa530d4fd9.tar.gz
git-87d99c64dfa8880592104245896557aa530d4fd9.tar.bz2
Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
* jm/mergetool-pathspec: mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files
Diffstat (limited to 'Documentation/git-receive-pack.txt')
0 files changed, 0 insertions, 0 deletions