projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 02afeff) | patch
pull: only allow ff merges by default felipec/fc/pull/ff-only
authorFelipe Contreras <felipe.contreras@gmail.com>
Mon, 28 Apr 2014 18:24:53 +0000 (13:24 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Thu, 1 May 2014 23:56:59 +0000 (18:56 -0500)
commit9576cd043723b3e7a4aa77e6916aec529aaa353c
treee71c220ac92130baa6ee08da753ad13a6f41f237tree | snapshot
parent02afeffecad6487a94bde41ea9df9af92cc0ae1acommit | diff
pull: only allow ff merges by default

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/t4013-diff-various.sh diff | blob | blame | history
t/t5500-fetch-pack.sh diff | blob | blame | history
t/t5520-pull.sh diff | blob | blame | history
t/t5524-pull-msg.sh diff | blob | blame | history
t/t5700-clone-reference.sh diff | blob | blame | history
t/t6022-merge-rename.sh diff | blob | blame | history
t/t6026-merge-attr.sh diff | blob | blame | history
t/t6029-merge-subtree.sh diff | blob | blame | history
t/t6037-merge-ours-theirs.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.