Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Teach git-pull about --[no-]ff, --no-squash and --commit
author
Lars Hjemli
<hjemli@gmail.com>
Mon, 29 Oct 2007 08:41:18 +0000
(09:41 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 29 Oct 2007 20:32:52 +0000
(13:32 -0700)
These options are supported by git-merge, but git-pull didn't know about
them.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
raw
|
patch
| inline |
side by side
(from:
5072a32
)
No differences found