summaryrefslogtreecommitdiff
path: root/Documentation/git-upload-pack.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-09 06:42:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-09 06:42:23 (GMT)
commit5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe (patch)
tree3dd41869a6847564828ec508a356cec213b13a18 /Documentation/git-upload-pack.txt
parent389e0baa942c4548c5baa60541045b8900113378 (diff)
parente2ced7de19c85f3b246480bfacdcc934c98c08ca (diff)
downloadgit-5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe.zip
git-5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe.tar.gz
git-5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe.tar.bz2
Merge branch 'mm/maint-merge-ff-error-message-fix' into maint
* mm/maint-merge-ff-error-message-fix: builtin-merge: show user-friendly error messages for fast-forward too. merge-recursive: make the error-message generation an extern function Conflicts: merge-recursive.c
Diffstat (limited to 'Documentation/git-upload-pack.txt')
0 files changed, 0 insertions, 0 deletions