Simple (hopefully) git rebase question
by Anderson, Daniel
I am having trouble with git rebase. It seems to be much more complex than it needs to be. All I need to do is to merge commits—no conflicts, no undo.
So I edited the rebase file below and changed the last “pick” to “squash” and moved the previous “pick” down two lines (because I think the commits I am rebasing must be together). Here is the session with the file after editing (changes in bold, deleted lines underlined bold).
Any hints?
Dan
$ git rebase --abort
$ git rebase -i HEAD~10
pick 1c68b3d tabrmd: Set default tcti & conf string in option structure initialization.
pick 98a3dd1 TctiDynamic: Fix bad default TCTI library string.
pick 6f8e54d ci: Install libgcrypt development package.
pick 52de684 tabrmd: Combine --tcti and --tcti-conf string.
pick 377792a tcti-util: Allow shortened TCTI library names to align with the tools.
pick 5c4be78 D-Bus: install a service file to allow on-demand systemd unit activation
pick 84e9e9a tcti: fix build error due wrong TCTI transmit functions signatures
pick fb9bc17 Update our TCTI implementation to align with upstream changes.
pick 1317cbe D-Bus: install a service file to allow on-demand systemd unit activation
pick 70c9fac INSTALL.md: Document Configure Flags Better [Moved down 2 lines]
pick 5c6ec7f tcti: fix build error due wrong TCTI transmit functions signatures
pick 3dbc9f2 Update our TCTI implementation to align with upstream changes.
pick 70c9fac INSTALL.md: Document Configure Flags Better
pick squash 23515f7 INSTALL.md: Document Configure Flags Better
# Rebase 1743dca..8e6b37c onto 1743dca (13 command(s))
Rebasing (6/13)Rebasing (7/13)Rebasing (8/13)Rebasing (9/13)The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
interactive rebase in progress; onto 1743dca
Last commands done (9 commands done):
pick fb9bc17 Update our TCTI implementation to align with upstream changes.
pick 1317cbe D-Bus: install a service file to allow on-demand systemd unit activation
Next commands to do (4 remaining commands):
pick 5c6ec7f tcti: fix build error due wrong TCTI transmit functions signatures
pick 3dbc9f2 Update our TCTI implementation to align with upstream changes.
You are currently rebasing branch 'dan-diroptions' on '1743dca'.
Untracked files:
baksrc.sh
bug.txt
build.sh
rebase-push.script
rebase.script
nothing added to commit but untracked files present
Could not apply 1317cbece92af7c94916672bf2f9c49dbe348b01... D-Bus: install a service file to allow on-demand systemd unit activation
3 years, 7 months