projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1373776) | patch
pull: add warning on non-ff merges
authorFelipe Contreras <felipe.contreras@gmail.com>
Mon, 9 Sep 2013 01:11:38 +0000 (20:11 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Thu, 1 May 2014 23:51:08 +0000 (18:51 -0500)
commit02afeffecad6487a94bde41ea9df9af92cc0ae1a
tree797d2bb2b2370f184ad545d8e9415e0fdb882367tree | snapshot
parent1373776d9ca7d9d79c2c2229bc0a43b2ddd7cfb8commit | diff
pull: add warning on non-ff merges

To prepare our uses for the upcoming changes we should warn them and let
them know that they will need to specify a merge or a rebase in the
future (when a non-fast-forward situation arises). Also, let them know
we fallback to 'git pull --merge', so when the obsoletion of this mode
comes, they know what to type without interrupting or changing their
workflow.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Documentation/git-pull.txt diff | blob | blame | history
git-pull.sh diff | blob | blame | history
t/t5520-pull.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.