summaryrefslogtreecommitdiff
path: root/commit-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-23 23:47:32 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-23 23:47:32 -0800
commitbdaa085f8c33e75cf477ff6b4292f35c9c5f4c22 (patch)
treed86399b24c7f85c94664b114037512bc9cbdc66e /commit-tree.c
parent9bc8b776c54e9b4c3b753639b4ae70acb2ff8db6 (diff)
parent8323124afe49353e09d041eb8ed3be4c2477c180 (diff)
downloadgit-bdaa085f8c33e75cf477ff6b4292f35c9c5f4c22.tar.gz
Merge branch 'jc/pull'
* jc/pull: git-pull: reword "impossible to fast-forward" message. git-pull: further safety while on tracking branch.
Diffstat (limited to 'commit-tree.c')
0 files changed, 0 insertions, 0 deletions