diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:41 -0700 |
| commit | e25e6f3947403ed87cc016b7dc2c0692a5b6c2d2 (patch) | |
| tree | ad510c932c046ecf821a472500f90807ca24d960 /builtin/replace.c | |
| parent | Merge branch 'jt/format-patch-base-info-above-sig' into maint (diff) | |
| parent | rebase-interactive: drop early check for valid ident (diff) | |
| download | tgif-e25e6f3947403ed87cc016b7dc2c0692a5b6c2d2.tar.xz | |
Merge branch 'jk/rebase-i-drop-ident-check' into maint
Even when "git pull --rebase=preserve" (and the underlying "git
rebase --preserve") can complete without creating any new commit
(i.e. fast-forwards), it still insisted on having a usable ident
information (read: user.email is set correctly), which was less
than nice. As the underlying commands used inside "git rebase"
would fail with a more meaningful error message and advice text
when the bogus ident matters, this extra check was removed.
* jk/rebase-i-drop-ident-check:
rebase-interactive: drop early check for valid ident
Diffstat (limited to 'builtin/replace.c')
0 files changed, 0 insertions, 0 deletions