Sam Vilain <sam.vilain@xxxxxxxxxxxxxxx> wrote:
> This is primarily so that there is an easy switch to 'git-pull' to
> be sure to fast forward only.
Is this still broken or am I just doing something totally wrong?
% git reset --hard origin/master~15
HEAD is now at e1341ab... Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk into pm/gitk
% git merge -s ff origin/master
Automatic merge failed; fix conflicts and then commit the result.
[1] 19368 exit 1 git merge -s ff origin/master
% git merge origin/master
Updating e1341ab..7c85173
Fast forward
[..]
23 files changed, 236 insertions(+), 79 deletions(-)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
