diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-22 01:57:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-22 01:57:24 -0800 |
| commit | dcd0409fc545e881a61f522eb8f1d1a7e814eb94 (patch) | |
| tree | 2ed0008ffb49a645cc46af10c72e069f71fc50cb /git-merge-resolve.sh | |
| parent | Merge branch 'jc/revlist' into next (diff) | |
| parent | git-pull: reword "impossible to fast-forward" message. (diff) | |
| download | tgif-dcd0409fc545e881a61f522eb8f1d1a7e814eb94.tar.xz | |
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 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions