]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cbb408e 5971b08)
Merge branch 'js/rebase-recreate-merge'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2018 06:06:40 +0000 (15:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2018 06:06:40 +0000 (15:06 +0900)
commit95dd4b2b14db912b482320c0a69518e77e7af19a
tree2669be208ec8d5660fa69ebda9006e16a0abd3d7tree | snapshot
parentcbb408e6aef5b0d06facc16bb7a8615925894ad4commit | diff
parent5971b0836eece0ffcafe15fd5d67934787ea1777commit | diff
Merge branch 'js/rebase-recreate-merge'

Hotfixes.

* js/rebase-recreate-merge:
  sequencer: ensure labels that are object IDs are rewritten
  git-rebase--interactive: fix copy-paste mistake
git-rebase--interactive.sh diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
t/t3430-rebase-merges.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.