Hi Yegappan,
2018/7/16 Mon 2:04:53 UTC+9 [email protected] wrote:
> Hi all,
>
> On Sat, Jul 14, 2018 at 12:22 PM, Yegappan Lakshmanan
> <[email protected]> wrote:
> > @yegappan pushed 30 commits.
> >
> > ce287fe patch 8.1.0156: MS-Windows compiler warning
> > 911768a patch 8.1.0157: old iTerm2 is not recognized, resulting in stray
> > output
> > 2ef3c9d patch 8.1.0158: GUI: input() fails if CTRL-C was pressed before
> > d2f0e50 patch 8.1.0159: completion for user names does not work for a
> > prefix.
> > 97343d1 patch 8.1.0160: no Danish manual translations
> > 24897f6 patch 8.1.0161: buffer not updated with 'autoread' set if file was
> > deleted
> > 3feb3a8 patch 8.1.0162: Danish and German man pages are not installed
> > 68945be patch 8.1.0163: insufficient testing for Tcl
> > 9b6af45 patch 8.1.0164: luaeval('vim.buffer().name') returns an error
> > 6a4849d Update runtime files, add Danish translations.
> > 8fb7349 patch 8.1.0165: :clist output can be very long
> > d8fb1cf patch 8.1.0166: using dict_add_nr_str() is clumsy
> > 1e2c6ac patch 8.1.0167: lock flag in new dictitem is reset in many places
> > 3b9aa07 patch 8.1.0168: output of :marks is too short with multi-byte chars
> > f533ce8 patch 8.1.0169: calling message_filtered() a bit too often
> > 2cc0c84 patch 8.1.0170: invalid memory use with complicated pattern
> > 8166be4 patch 8.1.0171: typing CTRL-W n in a terminal window causes ml_get
> > error
> > b5d19cb patch 8.1.0172: 'viminfofile' option does not behave like a file
> > name
> > 578b99c patch 8.1.0173: compiler warning on MS-Windows
> > 7648830 patch 8.1.0174: after paging up and down fold line is wrong
> > da399bc patch 8.1.0175: marks test fails in very wide window
> > 7eac9c8 patch 8.1.0176: overlapping string argument for strcpy()
> > 0136e21 patch 8.1.0177: defining function in sandbox is inconsistent
> > 71a0d5a patch 8.1.0178: warning for passing pointer to non-pointer argument
> > 571e2fd patch 8.1.0179: redundant condition for boundary check
> > abf0352 patch 8.1.0180: static analysis errors in Lua interface
> > 12145a7 patch 8.1.0181: memory leak with trailing characters in skip
> > expression
> > f322241 patch 8.1.0182: Unicode standard was updated
> > 1072517 patch 8.1.0183: Lua API changed, breaking the build
> > 9c7ea57 Add neighbor window information to getwininfo()
> >
>
> When I tried to squash all the commits for this pull request into one
> using 'git rebase -i' and at the same time tried to rebase the branch,
> it messed up the commit log. How do I fix this? Any pointers?
Did you try to squash the commits after you merged the master branch into
your branch? Mixing merge and rebase can cause troubles.
You should rebase your commits on top of the latest master branch to fix this.
Try the following:
# Make the master branch up to date
git checkout master
git pull
# Create a backup of the wininfo branch
git checkout wininfo
git branch wininfo-backup
# Rebase your commits on top of master
git rebase -i master
Then the following items will be shown in the editor:
pick f36aadff3 Add neighbor window information to getwininfo()
pick 5701c833f Fix build failure with tiny version
pick d8fb1cf63 patch 8.1.0166: using dict_add_nr_str() is clumsy
pick 9c7ea5708 Add neighbor window information to getwininfo()
pick d47041f08 Fix sync conflict
Remove the 3rd line which is not a part of your commits, then save and exit.
Conflict will be occurred. You need to fix it by:
git mergetool
git merge --continue
If you would make a mistake and want to retry rebasing:
git rebase --abort
and/or:
git reset --hard wininfo-backup
After you fixed the problem, push with "git push -f".
If you want to update your PR next time, you can do it in a similar way:
git checkout master
git pull
git checkout wininfo
(git branch wininfo-backup2 # If needed)
git rebase master
# fix conflict
Regards,
Ken Takata
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
