diff options
| author | Arnaud Fontaine <arnau@debian.org> | 2013-07-02 17:05:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-02 12:46:30 -0700 |
| commit | db2b3b820e2b28da268cc88adff076b396392dfe (patch) | |
| tree | 138556cd722ed76cfbef4958c73e1d835643c16d /builtin/commit.c | |
| parent | 9832cb9d4dc969fbfacfd1f8940fcbdec18bb930 (diff) | |
| download | git-db2b3b820e2b28da268cc88adff076b396392dfe.tar.gz | |
Do not ignore merge options in interactive rebaseaf/rebase-i-merge-options
Merge strategy and its options can be specified in `git rebase`,
but with `--interactive`, they were completely ignored.
Signed-off-by: Arnaud Fontaine <arnau@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions