![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) | ||
| commit | 5072a32382fb65fa7295811575d0f5c09cbe0dc3 | |
| tree | 4e3609f8b9b9b900a2458ff67e7b2d42141c7090 | tree | snapshot |
| parent | e2b7eaf0ca3897940961d23392d4ff718867ea9f | commit | diff |
Teach git-pull about --[no-]ff, --no-squash and --commit
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>
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>
| git-pull.sh | diff | blob | history |