It would be great if git-log has a formatting option to insert an index of the
current commit since HEAD.
It would allow after quitting the git-log to immediately fire up "git rebase -i
HEAD~index" instead of "git rebase -i go-copy-paste-this-long-number-id".
On 20.08.2018 22:22, Johannes Sixt wrote:
Am 20.08.2018 um 19:40 schrieb Phillip Wood:
On 20/08/2018 11:22, Konstantin Kharlamov wrote:
It's spectacular, that content of one of inserted conflict markers is
empty, so all you have to do is to remove the markers, and use `git add`
on the file
So, steps-to-reproduce below rather full of trivia like setting up a
repo, but the TL;DR is:
Upon using `git rebase -i HEAD~1` and then `git add -p` to add part of a
"hunk" as one commit, and then using `git rebase --continue` so the
other part of hunk would be left in top commit; git raises a
3 matches
Mail list logo