diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-22 12:57:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-22 12:57:24 +0300 |
| commit | dcd0409fc545e881a61f522eb8f1d1a7e814eb94 (patch) | |
| tree | 2ed0008ffb49a645cc46af10c72e069f71fc50cb /blame.c | |
| parent | 8ff8eea016f27d22d0264b140843470c7f14e004 (diff) | |
| parent | 8323124afe49353e09d041eb8ed3be4c2477c180 (diff) | |
Merge branch 'jc/pull' into next
* jc/pull:
git-pull: reword "impossible to fast-forward" message.
git-pull: further safety while on tracking branch.
Diffstat (limited to 'blame.c')
0 files changed, 0 insertions, 0 deletions