diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-10-29 08:41:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-29 20:32:52 (GMT) |
| commit | 5072a32382fb65fa7295811575d0f5c09cbe0dc3 (patch) | |
| tree | 4e3609f8b9b9b900a2458ff67e7b2d42141c7090 /builtin-blame.c | |
| parent | e2b7eaf0ca3897940961d23392d4ff718867ea9f (diff) | |
| download | git-5072a32382fb65fa7295811575d0f5c09cbe0dc3.zip git-5072a32382fb65fa7295811575d0f5c09cbe0dc3.tar.gz git-5072a32382fb65fa7295811575d0f5c09cbe0dc3.tar.bz2 | |
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>
Diffstat (limited to 'builtin-blame.c')
0 files changed, 0 insertions, 0 deletions